cherrypick is a merge but no option was given