diff --git a/web/spec/controllers/api_jam_track_mixdowns_controller_spec.rb b/web/spec/controllers/api_jam_track_mixdowns_controller_spec.rb
index 688394971..759882ebb 100644
--- a/web/spec/controllers/api_jam_track_mixdowns_controller_spec.rb
+++ b/web/spec/controllers/api_jam_track_mixdowns_controller_spec.rb
@@ -24,11 +24,7 @@ describe ApiJamTrackMixdownsController, type: :controller do
       json = JSON.parse(response.body)
       json["next"].should be_nil
       json["count"].should eq(1)
-<<<<<<< HEAD
-      json["mixdowns"][0]["settings"].should eq({})
-=======
       json["mixdowns"][0]["settings"].should eq({"speed" => 5})
->>>>>>> develop
 
       # and then add a package
       package = FactoryGirl.create(:jam_track_mixdown_package, jam_track_mixdown: mixdown)
@@ -45,11 +41,7 @@ describe ApiJamTrackMixdownsController, type: :controller do
   describe "create" do
 
     it "success" do
-<<<<<<< HEAD
-      post :create, {:format => 'json', jamTrackID: jam_track.id, name: 'some name', description: 'some description', settings: {}}
-=======
       post :create, {:format => 'json', jamTrackID: jam_track.id, name: 'some name', description: 'some description', settings: {speed:5}}
->>>>>>> develop
 
       response.status.should eq(200)
 
@@ -57,20 +49,12 @@ describe ApiJamTrackMixdownsController, type: :controller do
       json["name"].should eq('some name')
       json["jam_track_id"].should eq(jam_track.id)
       json["description"].should eq('some description')
-<<<<<<< HEAD
-      json["settings"].should eq({})
-=======
       json["settings"].should eq({"speed" => 5})
->>>>>>> develop
       json["packages"].should eq([])
     end
 
     it "validates name" do
-<<<<<<< HEAD
-      post :create, {:format => 'json', jamTrackID: jam_track.id, description: 'some description', settings: {}}
-=======
       post :create, {:format => 'json', jamTrackID: jam_track.id, description: 'some description', settings: {speed:5}}
->>>>>>> develop
 
       response.status.should eq(422)
 
@@ -88,11 +72,7 @@ describe ApiJamTrackMixdownsController, type: :controller do
       response.status.should eq(200)
 
       json = JSON.parse(response.body)
-<<<<<<< HEAD
-      json["message"].should eq("enqueued")
-=======
       puts json
->>>>>>> develop
       json["id"].should_not be_nil
 
       package = JamTrackMixdownPackage.find(json["id"])
@@ -122,11 +102,8 @@ describe ApiJamTrackMixdownsController, type: :controller do
       response.status.should eq(200)
 
       json = JSON.parse(response.body)
-<<<<<<< HEAD
-      json["message"].should eq("enqueued")
-=======
       puts json
->>>>>>> develop
+
       json["id"].should eq(package.id)
       JamTrackMixdownPackage.count.should eq(1)
     end