test file  - added B
test file  - B to C on master
test file  - added C 3rd line
test file  - merge conflict fixed
test file  - added D 4th line