Trying to create a conflict
Merge branch 'new_branch'
Still Trying to create some sort of conflict