One file change
File changes in branch1
Merge branch 'branch1'

Conflicts:
	pal.txt
Complex merge1
conflict happens
Merge solved