Add a line
Add new_branck
Rename new_branck -> new_branch
Add a line may occur conflict
Add a line may occur conflict
Conflict fixed
Branch merge
conflict
Fix bug1
Add another line after bugfix.
merge dev

Conflicts:
	README

Merge dev.