Adding first set of changes to MergeConflict
Adding different set of changes to MergeConflict
Merge branch 'different'