diff --git a/.flake8 b/.flake8
index f15eeaf..1d80093 100644
--- a/.flake8
+++ b/.flake8
@@ -13,10 +13,6 @@ max-line-length = 80
 #    E203  # whitespace before ':' (Black)
 
 per-file-ignores =
-<<<<<<< HEAD
-    ./i.sentinel_2.parallel.index/i.sentinel_2.parallel.index.py: E501,F821
     ./i.sentinel_2.autotraining/i.sentinel_2.autotraining.py: E501,F821
-=======
-    ./i.sentinel_2.parallel.index/i.sentinel_2.parallel.index.py: E501,F821,W503
+    ./i.sentinel_2.parallel.index/i.sentinel_2.parallel.index.py: E501,F821
     ./i.sentinel_2.sen2cor/i.sentinel_2.sen2cor.py: E501,F821
->>>>>>> 9c5d1237bb48012a273ba895a78488f52624bf61