Fix conflicts

apps/solver/app.h

@@ -44,6 +44,7 @@ public:
   ViewController * intervalController() { return &m_intervalController; }
   SolutionsController * solutionsController() { return &m_solutionsController; }
   void willBecomeInactive() override;
+  TELEMETRY_ID("Solver");
 private:
   App(Snapshot * snapshot);
   SolutionsController m_solutionsController;

apps/solver/interval_controller.h

@@ -12,6 +12,7 @@ public:
   IntervalController(Responder * parentResponder, InputEventHandlerDelegate * inputEventHandlerDelegate, EquationStore * equationStore);
   const char * title() override;
   View * view() override { return &m_contentView; }
+  TELEMETRY_ID("Interval");
   int numberOfRows() const override;
   void willDisplayCellForIndex(HighlightCell * cell, int index) override;
 private:

apps/solver/list_controller.h

@@ -37,6 +37,7 @@ public:
   bool editSelectedRecordWithText(const char * text) override { return Shared::ExpressionModelListController::editSelectedRecordWithText(text); }
   /* ViewController */
   View * view() override { return &m_equationListView; }
+  TELEMETRY_ID("List");
   /* Text/Layout Field Delegate */
   bool textFieldDidReceiveEvent(TextField * textField, Ion::Events::Event event) override;
   bool layoutFieldDidReceiveEvent(LayoutField * layoutField, Ion::Events::Event event) override;

apps/solver/solutions_controller.h

@@ -19,6 +19,8 @@ public:
   void viewWillAppear() override;
   void viewDidDisappear() override;
   void didEnterResponderChain(Responder * previousFirstResponder) override;
+  TELEMETRY_ID("Solutions");
+
   /* AlternateEmptyViewDefaultDelegate */
   bool isEmpty() const override;
   virtual I18n::Message emptyMessage() override;