Fixes merge clobber