fixed merge crap