diff --git a/README.md b/README.md
index 24be975..0e2611c 100644
--- a/README.md
+++ b/README.md
@@ -111,7 +111,11 @@ end
 
 ### Multiple Environments
 
+<<<<<<< HEAD
 Deploy your site to more than one configuration using environment variables.
+=======
+Deploy to different environments using environment variables and Rake tasks.
+>>>>>>> 260665eef9aa105ebd6521f300cbdc059e063a82
 
 ```ruby
 # config.rb