Revert "Merge branch 'B1'"

This reverts commit c2ad29dcbf1f38e12b371b9f77b8c022504b0036, reversing
changes made to 98743993a8cae83b3e0d363325ba2138a5b808ac.
Test
Merge branch 'B1'

Conflicts:
	First File.txt