Drop some left over merge crap