first commit for branch test4
second commit test2
sencond commit for test4
Merge branch 'test4'

Conflicts:
	src/Test1.java
	src/Test2.java
Merge branch 'test4'

Conflicts:
	src/Test1.java
	src/Test2.java
branch 3 file and commit file
brach 3 file in repo