Fixconflict with a cherry-pick