Fixed a git conflict in the Markdown files