Adding new text to MergeTest for conflicts