fixed conflict

test/system/membership_actions_test.rb

@@ -0,0 +1,9 @@
+require "application_system_test_case"
+
+class Settings::MembershipActionsTest < ApplicationSystemTestCase
+  # test "visiting the index" do
+  #   visit settings_membership_actions_url
+  #
+  #   assert_selector "h1", text: "Settings::MembershipAction"
+  # end
+end