Adding 2 files
add and modify
commited in new branch
changes in main branch
change in main
Merge branch 'master' into newBranch
conflict check
conflict check
Merge branch 'newBranch'

Conflicts:
	hardware-qemu.ini
delete
Merge branch 'master' into newBranch
conflict
conflict
conflict
cc
bbb
Merge branch 'newBranch'

Conflicts:
	hardware-qemu.ini
changes