Fixing merge clobber.