Fix merge errors

Author: bparks13

OpenEphys.Onix1.Design/NeuropixelsV1ProbeConfigurationDialog.cs

@@ -88,13 +88,13 @@ public NeuropixelsV1ProbeConfigurationDialog(IConfigureNeuropixelsV1 configureNo
             checkBoxSpikeFilter.Checked = configureNode.ProbeConfiguration.SpikeFilter;
             checkBoxSpikeFilter.CheckedChanged += SpikeFilterIndexChanged;
 
-            checkBoxInvertPolarity.Checked = ProbeConfiguration.InvertPolarity;
+            checkBoxInvertPolarity.Checked = configureNode.ProbeConfiguration.InvertPolarity;
             checkBoxInvertPolarity.CheckedChanged += InvertPolarityIndexChanged;
 
-            textBoxAdcCalibrationFile.Text = ProbeConfiguration.AdcCalibrationFileName;
+            textBoxAdcCalibrationFile.Text = configureNode.ProbeConfiguration.AdcCalibrationFileName;
             textBoxAdcCalibrationFile.TextChanged += (sender, e) => ProbeConfiguration.AdcCalibrationFileName = ((TextBox)sender).Text;
 
-            textBoxGainCalibrationFile.Text = ProbeConfiguration.GainCalibrationFileName;
+            textBoxGainCalibrationFile.Text = configureNode.ProbeConfiguration.GainCalibrationFileName;
             textBoxGainCalibrationFile.TextChanged += (sender, e) => ProbeConfiguration.GainCalibrationFileName = ((TextBox)sender).Text;
 
             comboBoxChannelPresets.DataSource = Enum.GetValues(typeof(ChannelPreset));

OpenEphys.Onix1.Design/NeuropixelsV2eProbeConfigurationDialog.cs

@@ -270,7 +270,7 @@ void TextBoxKeyPress(object sender, KeyPressEventArgs e)
             CheckStatus();
         }
 
-        internal void UpdateControls(NeuropixelsV2QuadShankProbeConfiguration configuration, string calibrationFile, bool invertPolarity)
+        internal void UpdateControls(NeuropixelsV2ProbeConfiguration configuration, string calibrationFile, bool invertPolarity)
         {
             comboBoxReference.SelectedItem = configuration.Reference;
             checkBoxInvertPolarity.Checked = invertPolarity;