add files
change filez
change new.txt
Merge branch 'new_branch'

Conflicts:
	new.txt - fixed