fix a sync conflict