Committing changes in a new branch
Resolving conflict