Fix merging comflicts

Drone/FlightLib2/FlightLib.py

@@ -213,7 +213,7 @@ def land(descend=True, z=1.0, frame_id_descend="aruco_map", frame_id_land="aruco
             interrupt_event.clear()
             break
 
-        telemetry = get_telemetry(frame_id='aruco_map')
+        telemetry = get_telemetry(frame_id=frame_id_land)
         module_logger.info("Landing...")
         time_passed = (rospy.get_rostime() - time_start).to_sec() * 1000
 

Drone/client.py

@@ -110,7 +110,11 @@ def form_message(str_command, dict_arguments):
 def parse_message(msg):
     try:
         j_message = json.loads(msg)
+<<<<<<< HEAD
     except ValueError:
+=======
+    except json.JSONDecodeError:
+>>>>>>> 32c16bb2060a6cc7e46d6cea84d07a0c86094270
         print("Json string not in correct format")
         return None, None
 
@@ -253,13 +257,21 @@ try:
                 command, args = parse_message(message)
                 print("Command from server:", command, args)
                 if command == "writefile":
+<<<<<<< HEAD
                     recive_file(list(args.values())[0])
+=======
+                    recive_file(list(args.values)[0]) #TODO repace
+>>>>>>> 32c16bb2060a6cc7e46d6cea84d07a0c86094270
                 elif command == 'config_write':
                     write_to_config(args['section'], args['option'], args['value'])
                 elif command == 'config_reload':
                     load_config()
                 elif command == "starttime":
+<<<<<<< HEAD
                     starttime = float(list(args.values())[0])
+=======
+                    starttime = float(list(args.values)[0]) #TODO repace
+>>>>>>> 32c16bb2060a6cc7e46d6cea84d07a0c86094270
                     print("Starting on:", time.ctime(starttime))
                     dt = starttime - get_ntp_time(NTP_HOST, NTP_PORT)
                     print("Until start:", dt)