Fix git merge conflict