diff --git a/main.c b/main.c
index 1ce5f09..095fa7c 100644
--- a/main.c
+++ b/main.c
@@ -39,10 +39,13 @@ static void apply_edelay_at(int i);
 static void cal_interpolate(int s);
 void update_frequencies(void);
 void set_frequencies(uint32_t start, uint32_t stop, int16_t points);
+<<<<<<< HEAD
 
 void apply_edelay_at(int i);
 void set_frequencies(uint32_t start, uint32_t stop, int16_t points);
 void update_frequencies(void);
+=======
+>>>>>>> 3fc17e18f900c6bb31fb1e72bab345adf576c15c
 
 bool sweep(bool break_on_operation);
 
diff --git a/plot.c b/plot.c
index a447e42..62a9ed4 100644
--- a/plot.c
+++ b/plot.c
@@ -713,10 +713,17 @@ static void trace_get_value_string(
     chsnprintf(buf, len, "%.3fj", coeff[i][1]);
     break;
   case TRC_R:
+<<<<<<< HEAD
     gamma2resistance(buf, len, coeff[i]);
     break;
   case TRC_X:
     gamma2reactance(buf, len, coeff[i]);
+=======
+    gamma2resistance(buf, len, coeff);
+    break;
+  case TRC_X:
+    gamma2reactance(buf, len, coeff);
+>>>>>>> 3fc17e18f900c6bb31fb1e72bab345adf576c15c
     break;
   //case TRC_ADMIT:
   case TRC_POLAR:
diff --git a/si5351.c b/si5351.c
index 559a459..0728b56 100644
--- a/si5351.c
+++ b/si5351.c
@@ -330,7 +330,12 @@ int current_band = -1;
  * CLK2: fixed 8MHz
  */
 #define CLK2_FREQUENCY 8000000L
+<<<<<<< HEAD
 int si5351_set_frequency_with_offset(uint32_t freq, int offset, uint8_t drive_strength)
+=======
+int
+si5351_set_frequency_with_offset(uint32_t freq, int offset, uint8_t drive_strength)
+>>>>>>> 3fc17e18f900c6bb31fb1e72bab345adf576c15c
 {
   int band;
   int delay = 3;