diff --git a/uncompyle6/scanner.py b/uncompyle6/scanner.py
index be91fd85..64b335db 100644
--- a/uncompyle6/scanner.py
+++ b/uncompyle6/scanner.py
@@ -22,7 +22,6 @@ scanners, e.g. for Python 2.7 or 3.4.
 """
 
 from abc import ABC
->>>>>>> Stashed changes
 from array import array
 from collections import namedtuple
 from types import ModuleType