Switch branches
reset
changes
merge
Merge done
checkout
Merge conflicts