Line#1 in file C was midified in repoA
Line#1 in file C was midified in repoB
Merge remote-tracking branch 'upstream/branch1' into branch1

Conflicts:
	file C