Fixed some issues with handling deleted features while resolving merge conflicts.