Fix merge crap