fixed remaining merge crap