drop test.txt in master
Merge branch 'testing'
Merge branch 'testing'
create conflict: part 1
second part for creating conflict