resolve overlooked merge conflict

GUI/Model/Device/InstrumentLibrary.cpp

@@ -110,13 +110,8 @@ bool InstrumentLibrary::load()
                     if (foundVersion != 2)
                         return false;
 
-<<<<<<< HEAD
-                    Serializer sInstruments(&reader);
-                    m_instrumentItems.serialize(sInstruments);
-=======
                     Streamer sInstruments(&reader);
-                    m_model.serialize(sInstruments);
->>>>>>> af4532a401 (rename Serializer -> Streamer)
+                    m_instrumentItems.serialize(sInstruments);
                 }
             }
         }