Davor Racic

## Issue: Unapplied changes lost after conflict and subsequent successful sync **Description:** When a `db-sync` pull operation results in conflicts, and these conflicts are not resolved before a subsequent successful...