Fixed broken git merge