Forgot to fix conflicts, oops

Gemfile

@@ -77,7 +77,6 @@ group :development, :test do
 end
 
 group :development do
-<<<<<<< HEAD
   #gem 'perftools.rb'
   gem 'bullet'
   gem 'better_errors'
@@ -86,15 +85,6 @@ group :development do
   gem 'haml-rails'
   gem 'awesome_print'
   gem 'rails-footnotes', :github => 'josevalim/rails-footnotes'
-=======
-	#gem 'perftools.rb'
-	gem 'bullet'
-	gem 'better_errors'
-	gem 'binding_of_caller'
-	gem 'meta_request'
-	gem 'haml-rails'
-	gem 'awesome_print'
->>>>>>> FETCH_HEAD
 end
 
 group :test do

Gemfile.lock

@@ -1,12 +1,3 @@
-GIT
-<<<<<<< HEAD
-  remote: git://github.com/jim/carmen-rails.git
-  revision: 076dd251e075d07408e0b5268f886956ef2a347c
-  specs:
-    carmen-rails (1.0.0)
-      carmen (~> 1.0.0)
-      rails
-
 GIT
   remote: git://github.com/josevalim/rails-footnotes.git
   revision: 3a6ac1971e91d822f057650cc5916ebfcbd6ee37
@@ -15,8 +6,6 @@ GIT
       rails (>= 3.0.0)
 
 GIT
-=======
->>>>>>> FETCH_HEAD
   remote: git://github.com/svenfuchs/i18n-active_record.git
   revision: 55507cf59f8f2173d38e07e18df0e90d25b1f0f6
   specs: