Remove merge messages

micropython/modules/jv_motors/jv_motor_api.c

@@ -65,10 +65,6 @@ static mp_obj_t motor_make_new(const mp_obj_type_t *type, size_t n_args, size_t
   }
 
   motor_obj_t *obj = mp_obj_malloc_with_finaliser(motor_obj_t, &motor_type);
-<<<<<<< HEAD
-=======
-  obj->base.type = type;
->>>>>>> 5f2c74b983c645399cba0b6609d20aa445351d2e
   if (!reg_motor_init(&obj->motor, port, mtype, mdir == DIRECTION_CLOCKWISE)) {
     m_del_obj(motor_obj_t, obj);
     mp_raise_msg_varg(&mp_type_RuntimeError, MP_ERROR_TEXT("Motor port %d already opened"), port + 1);

micropython/modules/opencube_brick/battery.c

@@ -66,10 +66,7 @@ static MP_DEFINE_CONST_FUN_OBJ_1(battery_deinit_obj, battery_deinit);
 // Called on Battery init
 static mp_obj_t battery_make_new(const mp_obj_type_t* type, size_t n_args, size_t n_kw, const mp_obj_t* args) {
     battery_obj_t *self = mp_obj_malloc_with_finaliser(battery_obj_t, &opencube_battery_type);
-<<<<<<< HEAD
-=======
     self->base.type = type;
->>>>>>> 5f2c74b983c645399cba0b6609d20aa445351d2e
     self->multiplier = 1.0;
     // Initialise the ADC peripheral if it's not already running.
     // (this check is borrowed from machine_adc.c)