+ second commit
+ file 3
file4
Merge branch 'secondbranch'
- change file 3
- change fil 3
Merge branch 'secondbranch'

Conflicts:
	file3.txt