Fixed a few bugs.
Fixed issues with resolving conflicts that involved deleted features.
Fixed an issue that caused an error when a feature had no attributes other than geometry.