removed conflict i missed

Author: Supplementing

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/store/KibanaOwnedReservedRoleDescriptors.java

@@ -174,17 +174,11 @@ static RoleDescriptor kibanaSystem(String name) {
                     .privileges("write", "delete", "create_index")
                     .allowRestrictedIndices(true)
                     .build(),
-<<<<<<< HEAD
                 // Knowledge base. Fleet creates, manages, and uses this index to store knowledge base documents to be consumed by AI assistants.
                 RoleDescriptor.IndicesPrivileges.builder()
                     .indices(".integration_knowledge*")
                     .privileges("read", "write", "create_index")
                     .build(),
-=======
-                // Knowledge base. Fleet creates, manages, and uses this index to store knowledge base documents to be consumed by AI
-                // assistants.
-                RoleDescriptor.IndicesPrivileges.builder().indices(".integration_knowledge*").privileges("all").build(),
->>>>>>> 774c20bab17bd45c93886bdda6c3eb38d348e99a
                 // Other Fleet indices. Kibana reads and writes to these indices to manage
                 // Elastic Agents.
                 RoleDescriptor.IndicesPrivileges.builder()