adding 2.txt
adding 3.txt
modifying 3.txt
merge conflict
Merge branch 'feature'