B1 Edit
Merge remote-tracking branch 'origin/B1' into B2

Conflicts:
	First File.txt