10-Merge-Conflicts.md

Merge Conflicts

• Take me to Video Tutorial

In this section, we will take a look at merge conflicts

Remove the lines that we don't wanna keep to resolve the conficts and save the file.

` Add the changes to git again

$ git add fourth_story.txt