new file test.txt
added entry by fix02
new entry by master
and again one entry by fix02
merged fix02 into master
new file added