conflict hopeful

Trying to edit files so I can create a conflict when merging
test merge
This is a new commit

Information added here
testing the commit