refactor delete handling and apply it to users and groups
resolve merge conflicts after pull