'commit'
git ignore
delete
la
lalal
commit
branch version
branch version
index version
branch version
commit
commit
lalal
commit
Merge branch 'new_branch_3'

Conflicts:
	first.html