version check deduplication; resolved conflict wrong before