WTF was the merge crap?