Create 1conflict.txt
Merge pull request #4 from brthur/master

Create 1conflict.txt