A
B
C
Merge branch 'master' of https://github.com/AvenirKidon/BranchTest

Conflicts:
	file1.txt