Remove merge crap