M1
F1
M2
Merge branch 'master' into US2

Conflicts:
	another-file.txt