merge conflict

src/decition/decition_brain_sf_jsrunlegs/decition/decide_gps_00.cpp

@@ -2442,6 +2442,7 @@ static int file_num;
     }
 
 
+
     if(ServiceCarStatus.group_control){
         dSpeed = ServiceCarStatus.group_comm_speed;
     }
@@ -2661,7 +2662,6 @@ static int file_num;
 //                           <<"OBS_Speed"<< ","<<obsSpeed<< ","
 //                           <<"OBS_Distance"<< ","<<obsDistance<< ","
 //                           <<"TTC"<< ","<<ttc<< ","
-
                            <<"Decide_torque"  << ","  <<setprecision(2)<<gps_decition->torque<< ","
                            <<"Decide_Brake"<< ","  <<gps_decition->brake<< ","
                            <<"Vehicle_RealSpd"<< ","  <<setprecision(2)<<now_gps_ins.speed<< ","