diff --git a/.gitignore b/.gitignore
index a762830..5fff1d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1 @@
-<<<<<<< HEAD
-pkg/
-=======
 pkg
->>>>>>> adding License information and go format