try to modigy c.txt w/o merge :)
Merge branch 'master' of github.com:zynevich/test1
Merge branch 'master' of github.com:zynevich/test1

Conflicts:
	c.txt