Merges gone bad

I'm to blame, I know