added a line in dev, I want to the conflicts.

goods
change the title in master

see title changed??
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
a