creating the A and B files.
A: initialize the A file.
A: initialize the A file.
A: commit 2
B: initialize the B file.
add the fileC.txt
initialize the C file.
Merge branch 'branchA'

Conflicts:
	fileA.txt