Manasa changed the same MergeConflict.c File
Conflict Resolved