Remove merge crap.