removed some merge crap