conflict hopeful

Trying to edit files so I can create a conflict when merging