diff --git a/sdrbase/webapi/webapirequestmapper.cpp b/sdrbase/webapi/webapirequestmapper.cpp
index 28c16d2ae..e1cb2929b 100644
--- a/sdrbase/webapi/webapirequestmapper.cpp
+++ b/sdrbase/webapi/webapirequestmapper.cpp
@@ -192,9 +192,6 @@ const QMap<QString, QString> WebAPIRequestMapper::m_sinkDeviceHwIdToSettingsKey
     {"PlutoSDR", "plutoSdrOutputSettings"},
     {"RemoteOutput", "remoteOutputSettings"},
     {"SoapySDR", "soapySDROutputSettings"},
-<<<<<<< ours
-    {"XTRX", "XtrxOutputSettings"}
-=======
     {"XTRX", "xtrxOutputSettings"}
 };
 
@@ -205,7 +202,6 @@ const QMap<QString, QString> WebAPIRequestMapper::m_mimoDeviceHwIdToSettingsKey=
     {"BladeRF2", "bladeRF2MIMOSettings"},
     {"TestMI", "testMISettings"},
     {"TestMOSync", "testMOSyncSettings"}
->>>>>>> theirs
 };
 
 const QMap<QString, QString> WebAPIRequestMapper::m_mimoDeviceHwIdToActionsKey= {
diff --git a/sdrbase/webapi/webapirequestmapper.h b/sdrbase/webapi/webapirequestmapper.h
index e2375ed7d..5d981dbab 100644
--- a/sdrbase/webapi/webapirequestmapper.h
+++ b/sdrbase/webapi/webapirequestmapper.h
@@ -189,14 +189,11 @@ private:
     static const QMap<QString, QString> m_channelTypeToSettingsKey;
     static const QMap<QString, QString> m_sourceDeviceHwIdToSettingsKey;
     static const QMap<QString, QString> m_sinkDeviceHwIdToSettingsKey;
-<<<<<<< ours
-=======
     static const QMap<QString, QString> m_mimoDeviceHwIdToSettingsKey;
     static const QMap<QString, QString> m_channelTypeToActionsKey;
     static const QMap<QString, QString> m_sourceDeviceHwIdToActionsKey;
     static const QMap<QString, QString> m_sinkDeviceHwIdToActionsKey;
     static const QMap<QString, QString> m_mimoDeviceHwIdToActionsKey;
->>>>>>> theirs
 };
 
 #endif /* SDRBASE_WEBAPI_WEBAPIREQUESTMAPPER_H_ */