diff --git a/.htaccess b/.htaccess
index df8722a..1511ab4 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,8 +1,5 @@
-<<<<<<< HEAD
-=======
 <IfModule mod_headers.c>
 	Header set Access-Control-Allow-Origin "*"
 	Header set Access-Control-Allow-Methods "GET, POST, OPTIONS"
 	Header set Access-Control-Allow-Headers "Content-Type, Authorization"
 </IfModule>
->>>>>>> 0cee3014507ab00f356db97502f8a1de7a5a6757