adding b.txt
adding a.txt
adding d.txt
Merge branch 'master' into feature1
commint
asdas asd
a.txt conflist fixed