[clipgrab/f23: 4/4] fix merge