Add 'ours' merge strategy.