Level: Basics 7 - "Merge Conflicts"

```
Merge Conflicts
```
This level puts the users through the process of resolving a merge conflict. The structure is similar to #249

```
Working Directory
...
Staging Area
...
Commit 1
intro.txt - "Once upon a time there was a princess"
commit 2
intro.txt - "Once upon a time there was a princess"
middle.txt - "She lived a fulfilling life"
commit 3 (branch)
intro.txt - "Once upon a time there was a princess"
middle.txt - "She lived"
ending.txt - "And then she died"
merge (master)
intro.txt - "Once upon a time there was a princess"
middle.txt - "She lived a fulfilling life"
ending.txt - "And then she died"
```