diff --git a/.gitignore b/.gitignore
index edf87049..2aed425f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,8 +63,5 @@ build/contracts
 # buidler
 artifacts
 cache
-<<<<<<< HEAD
 typechain
-=======
-typechain
->>>>>>> 64d52604ec3f9c9172250d8ab60275599074af87
+