Second line, first draft
First line
Typo
Merge branch 'SecondLine'

Conflicts:
	MyStory.txt