change the title name on the new branch
make confilc info in new branch
make conflict
change text
fix merge conflix