Fix merge clobber