Rebasing and merge conflict