Removed Merge Conflict Markup

Removed extra markup from the conflict in pr/1 merge