ch1 change
ch2 change
Merge branch 'ch1'
cccc
1
2
Merge branch 'ch1'

Conflicts:
	br1.c
asas
ch1 commit
ch2 commit
Merge branch 'ch1'

Conflicts:
	br1.c
Merge branch 'ch2'

Conflicts:
	br1.c