Creating conflict for DiffMerge - Third