fixed conflict

examples/flatland_2_0_example.py

@@ -37,11 +37,7 @@ env = RailEnv(width=100,
                                                    seed=14,  # Random seed
                                                    grid_mode=False,
                                                    max_rails_between_cities=2,
-<<<<<<< HEAD
-                                                   max_rails_in_city=13,
-=======
                                                    max_rails_in_city=8,
->>>>>>> fixed first tests in malfunction test
                                                    ),
               schedule_generator=sparse_schedule_generator(speed_ration_map),
               number_of_agents=100,