Conflict added to Branch
Master Merge conflict purposefully caused
Merge branch 'small-conflict'

Conflicts:
	awesome_page.md
Merge Conflict Finished