diff --git a/.gitignore b/.gitignore
index b4be74a4..97ce64b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,24 +1,23 @@
 # Built application files
-<<<<<<< HEAD
 /*/build/
 build
- 
+
 # Crashlytics configuations
 com_crashlytics_export_strings.xml
- 
+
 # Local configuration file (sdk path, etc)
 local.properties
- 
+
 # Gradle generated files
 .gradle/
- 
+
 # Signing files
 .signing/
- 
+
 # User-specific configurations
 .idea
 *.iml
- 
+
 # OS-specific files
 .DS_Store
 .DS_Store?
@@ -27,7 +26,6 @@ local.properties
 .Trashes
 ehthumbs.db
 Thumbs.db
-=======
 *.apk
 *.ap_
 
@@ -67,4 +65,3 @@ captures/
 
 # Keystore files
 *.jks
->>>>>>> 2825a231044d7a3f3b41dacfd435a8a047966001