Creating conflict for DiffMerge