modified:   file1
	``master edited''
	modified:   file1
	``slave edited''
Merge branch 'slave'

Conflicts:
	file1

 Changes to be committed:

	modified:   file1
	modified:   file1 [slave]
	modified:   file1 [master]
	modified:   file1 [slave]
	`' -> ``''
Merge branch 'slave'

Conflicts:
	file1

	modified:   file1 [master]
	resolve conflict:
	master edited
	``slave edited''