Got rid of git merge stuff.