modified:   create-branch
resolve conflict the text