Fix git merge problem