diff --git a/.env_file b/.env_file
index faeaf7b..b9c2b3e 100644
--- a/.env_file
+++ b/.env_file
@@ -4,7 +4,3 @@ DEPLOY_ENV=local
 MODEL_NAME=audio.Model
 AWS_ACCESS_KEY_ID=SOMETHING
 AWS_SECRET_ACCESS_KEY=OTHERTHING
-<<<<<<< HEAD
-=======
-
->>>>>>> master