MergeConflict being added for second time
Finally adding MergeConflict in pristine state