Test 3

Author: jiechen0826

.github/workflows/ci.yml

@@ -1,12 +1,8 @@
 name: CI
-<<<<<<< HEAD
-on:
+on: # add comment to trigger test 3
   push:
     branches:
       - jiechen3/github_runner
-=======
-on: # adding comment to trigger event 2
->>>>>>> 7af37b94 (Test 2)
   pull_request:
     branches:
       - jiechen3/github_runner