Some fixes to new_file
Hotfix in branch hotfix2
Finished fixing the issue
Merge branch 'issue1'

Conflicts:
	new_file