From d8258c5d51578a0f260641b4472976b2030c93c7 Mon Sep 17 00:00:00 2001
From: Yuka Ikarashi <yukatkh@gmail.com>
Date: Thu, 3 Oct 2024 13:12:40 -0400
Subject: [PATCH] fix small merge conflicts

---
 src/exo/boundscheck.py | 2 +-
 src/exo/typecheck.py   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/exo/boundscheck.py b/src/exo/boundscheck.py
index da6ea372c..20eb8dc59 100644
--- a/src/exo/boundscheck.py
+++ b/src/exo/boundscheck.py
@@ -1117,7 +1117,7 @@ def eff_e(self, e, type_env):
             return eff_null(e.srcinfo)
         elif isinstance(e, LoopIR.WindowExpr):
             return eff_null(e.srcinfo)
-        elif isinstance(e, LoopIR.BuiltIn):
+        elif isinstance(e, LoopIR.Extern):
             return eff_null(e.srcinfo)
         elif isinstance(e, LoopIR.StrideExpr):
             return eff_null(e.srcinfo)
diff --git a/src/exo/typecheck.py b/src/exo/typecheck.py
index 3e183c6d4..b44c39a16 100644
--- a/src/exo/typecheck.py
+++ b/src/exo/typecheck.py
@@ -6,7 +6,6 @@
     get_writeconfigs,
     get_loop_iters,
 )
-from .builtins import BuiltIn_Typecheck_Error
 from .extern import Extern_Typecheck_Error
 from .memory import *