added a new file MergeConflict.c