add fileB
add some code to fileA
add fileC, modify fileA
Merge branch 'merge_featureB' into tmp_merge_branch

Conflicts:
	fileA.txt
fix some bug
Merge branch 'merge_featureB' into tmp_merge_branch