merge conflict from same branch