diff --git a/app/controllers/experiments_controller.rb b/app/controllers/experiments_controller.rb
index 90755aa54..de83b8f36 100644
--- a/app/controllers/experiments_controller.rb
+++ b/app/controllers/experiments_controller.rb
@@ -57,12 +57,7 @@ class ExperimentsController < ApplicationController
     if @experiment.save
       flash[:success] = t('experiments.update.success_flash',
                           experiment: @experiment.name)
-<<<<<<< HEAD
-
       redirect_to canvas_experiment_path(@experiment)
-=======
-      redirect_to project_path(@experiment.project)
->>>>>>> a4ec5585965a7a8e565d7ee9072a26e52ccd9fd3
     else
       flash[:alert] = t('experiments.update.error_flash')
       redirect_to :back