diff --git a/thread/thread.cpp b/thread/thread.cpp
index 3d06790c..2a5f4df1 100644
--- a/thread/thread.cpp
+++ b/thread/thread.cpp
@@ -852,6 +852,10 @@ R"(
 
 DEF_ASM_FUNC(_photon_thread_stub)
 R"(
+<<<<<<< HEAD
+=======
+        bl _asan_start           //; asan_start()
+>>>>>>> 63c82f3 (Fix on ARM64 asan hook)
         ldp x0, x1, [x29, #0x40] //; load arg, start into x0, x1
         str xzr, [x29, #0x40]    //; set arg as 0
         blr x1                   //; start(x0)