commit
commit1
Merge remote-tracking branch 'origin/master'
commit2
Merge remote-tracking branch 'origin/master'

Conflicts:
	people.txt
Merge remote-tracking branch 'origin/master'

Conflicts:
	people.txt
commit3
Merge remote-tracking branch 'origin/master'

Conflicts:
	people.txt
Merge remote-tracking branch 'origin/master'

Conflicts:
	people.txt
commit4
Balin Konstantin
Update people.txt
add Alex Schekovskiy
Balin Konstantin
add Alex Schekovskiy
save name
Merge remote-tracking branch 'origin/master'

Conflicts:
	people.txt
add Alex Schekovskiy
Update people.txt
Update people.txt