message: Resolved merge error
diff: @@ -30,7 +30,8 @@ dynamic::Trajectory DynamicBehaviorModel::Plan(
  float delta_time,
  const world::ObservedWorld& observed_world) {
  - dynamic::State ego_vehicle_state = observed_world.get_ego_state();
  + dynamic::State ego_vehicle_state =
  + observed_world.get_ego_agent()->get_current_state();
  double start_time = observed_world.get_world_time();
  float dt = integration_time_delta_;
  int num_trajectory_points = static_cast<int>(std::ceil(delta_time / dt));
  