cleaning up some merge crap