Add a simple message on dev branch
Change last line
Modify the same line of the dev branch, would cause merge fail
Fix merge conflicts by hand.
Delete last line
merge with on-off