resolve merge conflicts — support "delete" case