Successful merge conflict cherry-picking