diff --git a/flatland/envs/rail_env.py b/flatland/envs/rail_env.py
index 9854e722b9be10769a59d6f2ed0e9ccc2c9f890f..a56ea043bc3cb9883cfc183fe4bf34fdce79f1e3 100644
--- a/flatland/envs/rail_env.py
+++ b/flatland/envs/rail_env.py
@@ -5,14 +5,11 @@ import random
 
 from typing import List, Optional, Dict, Tuple
 
-<<<<<<< HEAD
-from flatland.utils.rendertools import RenderTool, AgentRenderVariant
-=======
 import numpy as np
 from gym.utils import seeding
 from dataclasses import dataclass
 
->>>>>>> env-step-facelift
+from flatland.utils.rendertools import RenderTool, AgentRenderVariant
 from flatland.core.env import Environment
 from flatland.core.env_observation_builder import ObservationBuilder
 from flatland.core.grid.grid4 import Grid4Transitions
@@ -752,7 +749,7 @@ class RailEnv(Environment):
                 print("Could Not close window due to:",e)
             self.renderer = None
 
-            
+
 @dataclass(repr=True)
 class AgentTransitionData:
     """ Class for keeping track of temporary agent data for position update """