_conflict resolving_ will be added.
conflict resolving will be added.