diff --git a/src/simudator/core/processor.py b/src/simudator/core/processor.py
index 592ad03a93140c0ee6f99f4466f1e4acc31b1422..bb33eb9f836ef8c14247bf4440ce1e1fa7c5be5a 100644
--- a/src/simudator/core/processor.py
+++ b/src/simudator/core/processor.py
@@ -412,11 +412,7 @@ class Processor:
     def pretty_print(self) -> None:
         self.pretty_print_verbose(self.ignore_keys)
 
-<<<<<<< HEAD
-    def pretty_print_verbose(self, ignore_keys=[]) -> None:
-=======
     def pretty_print_verbose(self, ignore_keys=None) -> None:
->>>>>>> main
         """
         Prints the most relevant information about each module
         compact and pretty. Fields of modules can be ignored with the
@@ -426,7 +422,7 @@ class Processor:
         memory_modules = []
         other_modules = []
 
-        if ignore_keys == None:
+        if ignore_keys is None:
             ignore_keys = []
 
         # TODO: remove isinstance(module, micro_memory)
diff --git a/src/simudator/gui/pipeline.py b/src/simudator/gui/pipeline.py
index b2779420763b0f92ec243d5c5c4d2e85345db22a..c351fab989e93fb227ec190c590202e894b3bf20 100644
--- a/src/simudator/gui/pipeline.py
+++ b/src/simudator/gui/pipeline.py
@@ -29,8 +29,6 @@ class PipeLine(QTableWidget):
         Instructions are set from get_current_instructions() in the Processor class.
         """
 
-    def set_instruction(self, instructions: list[str]) -> None:
-        """Give the pipeline the current CPU instructions."""
         self.instructions = instructions
         for i in range(len(self.instructions)):
             instruction = self.instructions[i][0]