Fixed issues with resolving conflicts that involved deleted features.