Edited in branch-local
Merge branch 'branch-local'

Conflicts:
	File 1.txt