Resolve conflicts in api v3 specs

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

spec/requests/api/v3/groups_spec.rb

@@ -415,6 +415,17 @@ describe API::V3::Groups, api: true  do
         expect(response).to have_http_status(404)
       end
     end
+
+    context "when authenticated as user with group permissions" do
+      it "updates group" do
+        group2.update(owner: user2)
+
+        put v3_api("/groups/#{group2.id}", user2), { name: 'Renamed' }
+
+        expect(response.status).to eq(200)
+        expect(group2.reload.name).to eq('Renamed')
+      end
+    end
   end
 
   describe "GET /groups/:id/projects" do
@@ -585,7 +596,6 @@ describe API::V3::Groups, api: true  do
 
         expect(response).to have_http_status(400)
       end
-<<<<<<< HEAD
 
       it "creates an ldap_group_link if ldap_cn and ldap_access are supplied" do
         group_attributes = attributes_for(:group, ldap_cn: 'ldap-group', ldap_access: Gitlab::Access::DEVELOPER)
@@ -594,26 +604,6 @@ describe API::V3::Groups, api: true  do
     end
   end
 
-  describe "PUT /groups" do
-    context "when authenticated as user without group permissions" do
-      it "does not create group" do
-        put v3_api("/groups/#{group2.id}", user1), attributes_for(:group)
-        expect(response.status).to eq(404)
-      end
-    end
-
-    context "when authenticated as user with group permissions" do
-      it "updates group" do
-        group2.update(owner: user2)
-        put v3_api("/groups/#{group2.id}", user2), { name: 'Renamed' }
-        expect(response.status).to eq(200)
-        expect(group2.reload.name).to eq('Renamed')
-      end
-=======
->>>>>>> ce-com/master
-    end
-  end
-
   describe "DELETE /groups/:id" do
     context "when authenticated as user" do
       it "removes group" do

spec/requests/api/v3/settings_spec.rb

@@ -9,10 +9,7 @@ describe API::V3::Settings, 'Settings', api: true  do
   describe "GET /application/settings" do
     it "returns application settings" do
       get v3_api("/application/settings", admin)
-<<<<<<< HEAD
 
-=======
->>>>>>> ce-com/master
       expect(response).to have_http_status(200)
       expect(json_response).to be_an Hash
       expect(json_response['default_projects_limit']).to eq(42)
@@ -36,10 +33,7 @@ describe API::V3::Settings, 'Settings', api: true  do
         put v3_api("/application/settings", admin),
           default_projects_limit: 3, signin_enabled: false, repository_storage: 'custom', koding_enabled: true, koding_url: 'http://koding.example.com',
           plantuml_enabled: true, plantuml_url: 'http://plantuml.example.com'
-<<<<<<< HEAD
 
-=======
->>>>>>> ce-com/master
         expect(response).to have_http_status(200)
         expect(json_response['default_projects_limit']).to eq(3)
         expect(json_response['signin_enabled']).to be_falsey