some merge crap