add git commands for resolving conflicts - git restore - git fetch - etc add merging command - git merge
