Creating conflict for DiffMerge - Second