diff --git a/src/braket/circuits/circuit.py b/src/braket/circuits/circuit.py
index cfb9428c9..696509bac 100644
--- a/src/braket/circuits/circuit.py
+++ b/src/braket/circuits/circuit.py
@@ -867,13 +867,13 @@ def _validate_parameters(self, parameter_values: dict[str, Number]) -> None:
                 to a value to assign to them.
 
         Raises:
-<<<<<<< HEAD
+        <<<<<<< HEAD
             ValueError: If a parameter name is given which does not appear in the circuit.
 
-=======
+        =======
             ValueError: If there are no parameters that match the key for the arg
                 param_values.
->>>>>>> 7601914 (batched)
+        >>>>>>> 7601914 (batched)
         """
         parameter_strings = set()
         for parameter in self.parameters:
diff --git a/src/braket/jobs/quantum_job_creation.py b/src/braket/jobs/quantum_job_creation.py
index 14950a1b1..d0bccd540 100644
--- a/src/braket/jobs/quantum_job_creation.py
+++ b/src/braket/jobs/quantum_job_creation.py
@@ -336,7 +336,7 @@ def _validate_entry_point(source_module_path: Path, entry_point: str) -> None:
         # second argument allows relative imports
         importlib.invalidate_caches()
         module = importlib.util.find_spec(importable, source_module_path.stem)
-        if module is not None:
+        if module is None:
             raise AssertionError
     # if entry point is nested (ie contains '.'), parent modules are imported
     except (ModuleNotFoundError, AssertionError):