resolved merge conflicts

src/globals.h

@@ -54,5 +54,5 @@ extern std::set<uint16_t> macs;
 
 #ifdef BLECOUNTER
     extern int scanTime;
-    extern std::set<uint32_t> bles; 
+    extern std::set<uint16_t> bles; 
 #endif

src/main.cpp

@@ -45,7 +45,7 @@ configData_t cfg; // struct holds current device configuration
 osjob_t sendjob, initjob; // LMIC
 
 // Initialize global variables
-uint16_t macnum = 0, salt;
+int macnum = 0, salt;
 uint64_t uptimecounter = 0;
 bool joinstate = false;