Removing merge crap