Fix some git merge conflicts