3 print
Merge remote-tracking branch 'origin/new'

Conflicts:
	testProject/src/main/java/Run.java