errors :(
Merge remote-tracking branch 'origin/master'

Conflicts:
	new  2.txt