My step
1. create a branch hotfix_113, changed code and push
2. create a pull request to master branch
3. merge pull request
4. continue update code of branch hotfix_113
5. rebase fixup all commit to only one and force push
6. continue create pull request to master
7. CONFLICTS happen
Please guide me how can continue!
