Resolve merge conflict and fix test

qa/qa/resource/sandbox.rb

@@ -7,7 +7,7 @@ module QA
     # creating it if it doesn't yet exist.
     #
     class Sandbox < Base
-      attr_reader :path
+      attr_accessor :path
 
       attribute :id
 
@@ -27,7 +27,8 @@ module QA
             Page::Group::New.perform do |group|
               group.set_path(path)
               group.set_description('GitLab QA Sandbox Group')
-              group.set_visibility('Public')
+              # https://gitlab.com/gitlab-org/gitlab-ce/issues/52771
+              # group.set_visibility('Public')
               group.create
             end
           end

qa/qa/specs/features/browser_ui/1_manage/ee_group/group_ldap_sync_spec.rb

@@ -38,7 +38,7 @@ module QA
         end
 
         # Create a sand box group
-        Factory::Resource::Sandbox.fabricate_via_browser_ui! do |resource|
+        Resource::Sandbox.fabricate_via_browser_ui! do |resource|
           resource.path = "Synched-engineering-group-#{SecureRandom.hex(4)}"
         end
 
@@ -52,10 +52,15 @@ module QA
 
         EE::Page::Group::Menu.perform(&:go_to_members)
 
-        EE::Page::Group::Members.perform(&:click_sync_now)
+        users_synchronised = false
+        EE::Page::Group::Members.perform do |page|
+          page.click_sync_now
+          users_synchronised = page.with_retry(reload: true) do
+            page.has_content?('ENG User 2') && page.has_content?('ENG User 3')
+          end
+        end
 
-        expect(page).to have_content('ENG User 2')
-        expect(page).to have_content('ENG User 3')
+        expect(users_synchronised).to be_truthy
       end
     end
   end