git config
Resolving conflicts