More merge tests
Rename IrminMerge.fix to IrminMerge.apply