diff --git a/aibolit/__main__.py b/aibolit/__main__.py
index b7e3badf..e6a18701 100644
--- a/aibolit/__main__.py
+++ b/aibolit/__main__.py
@@ -37,13 +37,9 @@
 from os import scandir
 from pathlib import Path
 from sys import stdout
-<<<<<<< Updated upstream
 from typing import List, Any, Dict, Tuple
 
 import javalang
-=======
-from typing import List, Dict, Any, Tuple
->>>>>>> Stashed changes
 import numpy as np  # type: ignore
 import requests
 from lxml import etree  # type: ignore
diff --git a/test/recommend/test_recommend_pipeline.py b/test/recommend/test_recommend_pipeline.py
index 73b1d8e4..f1ba8dec 100644
--- a/test/recommend/test_recommend_pipeline.py
+++ b/test/recommend/test_recommend_pipeline.py
@@ -30,8 +30,8 @@
 from aibolit.config import Config
 
 from aibolit.__main__ import list_dir, calculate_patterns_and_metrics, \
-    create_xml_tree, create_text, format_converter_for_pattern, find_start_and_end_lines, find_annotation_by_node_type, \
-    add_pattern_if_ignored
+    create_xml_tree, create_text, format_converter_for_pattern, find_start_and_end_lines, \
+    find_annotation_by_node_type, add_pattern_if_ignored
 
 
 class TestRecommendPipeline(TestCase):