fixed merge conflicts

common/config/commonConfig.h.in

@@ -1,11 +1,14 @@
 #ifndef COMMON_CONFIG_COMMONCONFIG_H_
 #define COMMON_CONFIG_COMMONCONFIG_H_
 
+#include <cstdint>
+
 #define OBSW_ADD_LWGPS_TEST             0
 
+// Disable this for mission code. It allows exchanging TMTC packets via the Ethernet port
+#define OBSW_ADD_TCPIP_BRIDGE           1
 // Use TCP instead of UDP for the TMTC bridge. This allows using the TMTC client locally
 // because UDP packets are not allowed in the VPN
-#define OBSW_USE_TMTC_TCP_BRIDGE        1
 // This will cause the OBSW to initialize the TMTC bridge responsible for exchanging data with the
 // CCSDS IP Cores. 
 #define OBSW_USE_CCSDS_IP_CORE		 	1
@@ -13,5 +16,10 @@
 #define OBSW_TM_TO_PTME 				1
 // Set to 1 if telecommands are received via the PDEC IP Core
 #define OBSW_TC_FROM_PDEC			    0
+#define OBSW_USE_TCP_BRIDGE             1
+
+namespace common {
+extern const uint16_t TC_PACKET_ID;
+}
 
 #endif /* COMMON_CONFIG_COMMONCONFIG_H_ */