Correct merge error

main.c

@@ -870,8 +870,7 @@ config_t config = {
 #endif
   .lcd_palette = LCD_DEFAULT_PALETTE,
   .vbat_offset = 500,
-  .frequency_IF2 = 2048600000,
+  .frequency_IF2 = 0,
-  .setting_frequency_10mhz = 1000015.0,
   .low_level_offset =       100,    // Uncalibrated
   .high_level_offset =      100,    // Uncalibrated
   .correction_frequency = { 10000, 100000, 200000, 500000, 50000000, 140000000, 200000000, 300000000, 330000000, 350000000 },

si4432.c

@@ -2206,7 +2206,7 @@ reset:
   my_microsecond_delay(1000);
   SI_SDN_LOW;
   my_microsecond_delay(1000);
-  ili9341_set_foreground(BRIGHT_COLOR_GREEN);
+  ili9341_set_foreground(LCD_BRIGHT_COLOR_GREEN);
   while (!SI4463_READ_CTS) {
     ili9341_drawstring_7x13("Waiting", 50, 200);
     my_microsecond_delay(100);