added period at end of MergeConflict
removed period from MergeConflict