after lunch commit
commit on branch ag
first.txt on master
second.txt on ag
Merge branch 'ag'
commit on ag
commit on master
Merge branch 'ag'

Conflicts:
	second.txt
second.txt on ag100
first.txt on master