diff --git a/.gitignore b/.gitignore
index ab0fbe8..7fcc8fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # ---> Node
 # Logs
 logs
@@ -147,4 +146,3 @@ dist
 .externalNativeBuild
 .cxx
 local.properties
->>>>>>> 2733d8d (first commit)