squash stupid git merge conflicts