Try commit message
Let's see what will show
Delete a file
add a new file
change commited file to add another modification
make some changes in new brahc
make changes in mater after same file changed on branch
Merge branch 'btest'

Conflicts:
	newfile.txt