Fix git merge mistake