[clipgrab/f24: 4/4] fix merge