Fixing' some merge crap