diff --git a/vyper/compiler/input_bundle.py b/vyper/compiler/input_bundle.py
index bd4526861b..27170f0a56 100644
--- a/vyper/compiler/input_bundle.py
+++ b/vyper/compiler/input_bundle.py
@@ -153,12 +153,7 @@ def _normalize_path(self, path: Path) -> Path:
         # things like "foo/bar/../x.vy" => "foo/x.vy", with all
         # the caveats around symlinks that os.path.normpath comes with.
         try:
-<<<<<<< HEAD
             return path.resolve(strict=True)
-=======
-            with path.open() as f:
-                code = f.read()
->>>>>>> 23ef9d1682d4bc581de30ba1688be851907d063e
         except (FileNotFoundError, NotADirectoryError):
             raise _NotFound(path)
 
diff --git a/vyper/semantics/types/function.py b/vyper/semantics/types/function.py
index 8bde8828d0..97584596a8 100644
--- a/vyper/semantics/types/function.py
+++ b/vyper/semantics/types/function.py
@@ -17,11 +17,7 @@
     StructureException,
 )
 from vyper.semantics.analysis.base import FunctionVisibility, StateMutability, StorageSlot
-from vyper.semantics.analysis.utils import (
-    check_kwargable,
-    get_exact_type_from_node,
-    validate_expected_type,
-)
+from vyper.semantics.analysis.utils import check_kwargable, validate_expected_type
 from vyper.semantics.data_locations import DataLocation
 from vyper.semantics.types.base import KwargSettings, VyperType
 from vyper.semantics.types.primitives import BoolT
diff --git a/vyper/semantics/types/user.py b/vyper/semantics/types/user.py
index e474a61f08..458a1d2784 100644
--- a/vyper/semantics/types/user.py
+++ b/vyper/semantics/types/user.py
@@ -1,4 +1,5 @@
 from functools import cached_property
+from typing import Optional
 
 from vyper import ast as vy_ast
 from vyper.abi_types import ABI_GIntM, ABI_Tuple, ABIType