diff --git a/azumauindo/misc/crashlanding1 b/azumauindo/misc/crashlanding1
index af343435d..45e6842dc 100644
--- a/azumauindo/misc/crashlanding1
+++ b/azumauindo/misc/crashlanding1
@@ -7,11 +7,7 @@ enter_x 5
 enter_y 18
 msg
 Created:  2021-07-31 jason
-<<<<<<< Updated upstream
 Modified: 2022-01-03 jason
-=======
-Modified: 2022-01-02 Kevin Zheng
->>>>>>> Stashed changes
 endmsg
 outdoor 1
 end