let `git-conflicting` handle adds/removes