Fix merge branch to keep separate from my own stuff