After lunch commit.
Commit into branch ag.
Commit on master.
Commit on branch ag.
Merge branch 'ag'
Add a new line on branch ag
Add a new line on master
Merge branch 'ag'

Conflicts:
	second.txt
Modify file on master.