diff --git a/env.py b/env.py
index f782f57..030b632 100755
--- a/env.py
+++ b/env.py
@@ -93,6 +93,7 @@ def try_move(field, tractor):
     return False
 
 def look_at_plats(field, location):
+<<<<<<< HEAD
     wsp = []
 
 
@@ -105,6 +106,16 @@ def send_stats(field, location):
     return str_stats
 
 
+=======
+    wsp = [
+            (location[0] + 1, location[1]),
+            (location[0] - 1, location[1]),
+            (location[0], location[1] - 1),
+            (location[0], location[1] + 1)
+           ]
+
+    return wsp
+>>>>>>> 7994cc70ae86d020bb27138d1becb1bf9b8befe1
 
 if __name__ == "__main__":