test 5 add
test.php
dev - commit1
add 8
add 9
add 9
Merge branch 'dev'
add 10
2222222 -> 2
2222222 -> 2
Merge branch 'dev'
test.php
add 1111111111111111111
Merge branch 'origin/2st'

Conflicts:
	test.php
follow - add 4
add 1222222