Removed merge crap