FYI: Move conflict resolve + clean up afterwards

sync/internal_api/public/engine/sync_status.h

Index: sync/internal_api/public/engine/sync_status.h
diff --git a/sync/internal_api/public/engine/sync_status.h b/sync/internal_api/public/engine/sync_status.h
index 2f0d0c0348e5acea6a8a5382080a2cc7a457fcbc..9d0e933930fe5b4f9f5c95bf2f63b7a54128dc95 100644
--- a/sync/internal_api/public/engine/sync_status.h
+++ b/sync/internal_api/public/engine/sync_status.h
@@ -40,9 +40,6 @@ struct SYNC_EXPORT SyncStatus {
   // Number of hierarchy conflicts counted during most recent sync cycle.
   int hierarchy_conflicts;
 
-  // Number of simple conflicts counted during most recent sync cycle.
-  int simple_conflicts;
-
   // Number of items the server refused to commit due to conflict during most
   // recent sync cycle.
   int server_conflicts;
@@ -85,7 +82,6 @@ struct SYNC_EXPORT SyncStatus {
   // Nudge counts for each possible source
   int nudge_source_notification;
   int nudge_source_local;
-  int nudge_source_continuation;
   int nudge_source_local_refresh;
 
   // Encryption related.