resolving merge conflicts to create a new branch
fixing merge conflicts