diff --git a/.gitignore b/.gitignore
index ad8ef4c..99d45f8 100755
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ vendor/
analyticstracking.php
cache/
facebook_start.php
+sitemap.xml
# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
# composer.lock
diff --git a/index.php b/index.php
index 090e4be..1fdbd52 100755
--- a/index.php
+++ b/index.php
@@ -47,21 +47,10 @@
-<<<<<<< HEAD
-
Show your support for Net Neutrality by changing facebook profile picture.
-=======
-
Show your support for Net Neutrality by updating your facebook picture.
-
(It will not automatically change you picture)
-
-
+
Show your support for Net Neutrality by updating your facebook picture.
> Log in to Facebook
-
-
-
->>>>>>> update
-
-
> Log in to Facebook
-
+
+