fix merge crap