File4 content added - 2nd try.
File2 filled
Merge branches 'old-state' and 'master' into old-state

Conflicts:
	file4