diff --git a/.gitignore b/.gitignore
index a8f61c017..51163b4ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,13 +69,7 @@ fastlane/Preview.html
 fastlane/screenshots
 fastlane/test_output
 
-<<<<<<< HEAD
 
 
 /Shared/Secrets.swift
 *.py[cod]
-=======
-/Shared/Secrets.swift
-*.py[cod]
-
->>>>>>> mac-release
diff --git a/Shared/Article Rendering/ArticleRenderer.swift b/Shared/Article Rendering/ArticleRenderer.swift
index 50a9204b6..92f0de19c 100644
--- a/Shared/Article Rendering/ArticleRenderer.swift	
+++ b/Shared/Article Rendering/ArticleRenderer.swift	
@@ -264,6 +264,5 @@ private extension Article {
 		}
 		return url
 	}
-	
 }