MIT-BWSI-CSS · typicalrevolutionary · Mar 30, 2026 · Mar 30, 2026 · Mar 30, 2026 · Mar 30, 2026
diff --git a/.github/workflows/run_test.yml b/.github/workflows/run_test.yml
diff --git a/labs/.DS_Store b/labs/.DS_Store
diff --git a/labs/lab_1/lab_1a.py b/labs/lab_1/lab_1a.py
@@ -1,14 +1,20 @@
+
 """
 lab_1a.py
 
 The first lab in the BWSI CSS course. To complete this lab, fill out the variable on line 10
 with your name. Then, save the code, add it to the staging area, and commit it to the Git tree.
+<<<<<<< HEAD
+This is to simulate a change made on a robot: robot_speed = 8 # m/s
+=======
+This is to simulate a change made on a robot: robot_speed = 3 # m/s
+>>>>>>> f0ea6b2bbbeed28a29c681342b8ff6add88af4b4
 """
 
 def main():
     print("Hello World!")
 
-    name = "" # TODO: Insert your name between the double quotes
+    name = "Steven Liang" # TODO: Insert your name between the double quotes
 
     print(f"{name}, Welcome to the CSS course!")