create new branch
fix conflict
remove branches
what is auto-merging