diff --git a/.gitignore b/.gitignore
index 669f5ec..56f8d89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Files generated by invoking Julia with --code-coverage
 *.jl.cov
 *.jl.*.cov
@@ -25,4 +24,3 @@ docs/site/
 Manifest.toml
 =======
 /Manifest.toml
->>>>>>> a475770 (Files generated by PkgTemplates)