Merging with actual stuff fixed #2

codes_for_scrimmage/hazmat/mainhazmatUPD.py

@@ -46,10 +46,6 @@ async def monitor_distance():
 # New Section
 async def Run1():  # From M8_5.py
     right_arm.run_angle(1000,450)
-<<<<<<< HEAD
-    left_arm.run_angle(500,80)
-    await drive_base.straight(200)
-=======
     left_arm.run_angle(500,-80)
     await drive_base.straight(200)
 
@@ -88,43 +84,6 @@ async def Run1():  # From M8_5.py
     await drive_base.turn(-45)
     await drive_base.straight(500)
 
->>>>>>> Johannes_Dev
-
-    await drive_base.turn(-40)
-    await drive_base.straight(325)
-    await left_arm.run_angle(500,-80)
-
-    await drive_base.straight(-100)
-    await drive_base.straight(50)
-    await left_arm.run_angle(500,170)
-
-    await drive_base.straight(-270)
-    await drive_base.turn(40)
-    await drive_base.straight(135)
-    left_arm.run_angle(1000,670)
-
-    await right_arm.run_angle(5000,-450, Stop.HOLD)
-    await right_arm.run_angle(5000,450, Stop.HOLD)
-    await right_arm.run_angle(5000,-450, Stop.HOLD)
-    await right_arm.run_angle(5000,450, Stop.HOLD)
-    await right_arm.run_angle(5000,-450, Stop.HOLD)
-    right_arm.run_angle(5000,450, Stop.HOLD)
-
-    await drive_base.turn(-35)
-    await drive_base.straight(300)
-    await drive_base.turn(63)
-    await drive_base.straight(170)
-
-    await drive_base.turn(-80)
-    await drive_base.straight(87)
-    await drive_base.turn(-15)
-
-    await drive_base.straight(-120)
-    await drive_base.turn(-100)
-    await drive_base.straight(300)
-    await drive_base.turn(-45)
-    await drive_base.straight(500)
-
     
 async def Run2():  # From Heavy_lifting_final.py
     await drive_base.straight(200)
@@ -183,7 +142,6 @@ async def Run4():  # From Send_Over_Final.py
 
 # Add Rishi's code here
 async def Run5(): 
-<<<<<<< HEAD
     await drive_base.straight(600)
     await drive_base.straight(-100)
     await drive_base.straight(150)
@@ -194,18 +152,6 @@ async def Run5():
     await drive_base.turn(-45)
     await drive_base.straight(-200)
     await drive_base.turn(75)
-=======
-    await drive_base.straight(700)
-    await drive_base.turn(-20)
-    await drive_base.straight(110)
-    await drive_base.straight(-220)
-    await drive_base.turn(63)
-    await drive_base.straight(130)
-    await right_arm.run_angle(1000, -1200)
-    await drive_base.straight(84)
-    await right_arm.run_angle(300, 1200)
-    await drive_base.straight(-875)
->>>>>>> 2d614c0e381ebefc99efa272a3ec8ee172c5f6ce
 
 # Add - Adi's code here
 async def Run6():