Removed Git merge markup