amended file
d
added a and b
added c
test
f.txt
mergin two branches