Cleared git merge conflict