second file
master not after commit
Merge branch 'test'
modify second file
modified
Merge branch 'master' into test

Conflicts:
	secondgit.txt
create .gitignore file