changes
Merge pull request #2 from jshobbs/creating_conflicts

Fine