Fixed merge crap