fixing merge conflicts

Author: georgewallace

serverless/pages/custom-roles.asciidoc

@@ -14,7 +14,7 @@ This content applies to: {es-badge} {sec-badge}
 
 The built-in <<general-assign-user-roles-organization-level-roles,organization-level roles>> and <<general-assign-user-roles-instance-access-roles,instance access roles>> are great for getting started with {serverless-full}, and for system administrators who do not need more restrictive access.
 
-As an administrator, however, you have the ability to create your own roles to describe exactly the kind of access your users should have within a specific project.
+As an administrator, however, can create roles for users with the access they need within specific projects.
 For example, you might create a marketing_user role, which you then assign to all users in your marketing department.
 This role would grant access to all of the necessary data and features for this team to be successful, without granting them access they don't require.
 

serverless/pages/get-started-general.asciidoc

@@ -3,9 +3,10 @@
 
 There are two options to create serverless projects:
 
-* If you are an existing customer, https://cloud.elastic.co/login[log in to Elastic Cloud]. On the home page, you will see a new option to create serverless projects. Note that if you are already subscribed to Elastic Cloud, there is no specific trial for serverless projects.
 * If you are a new user, you can https://cloud.elastic.co/serverless-registration[sign up for a free 14-day trial], and you will be able to launch a serverless project. For more information about the trial see, <<general-sign-up-trial-what-is-included-in-my-trial,What is included in my trial?>>.
 
+* If you are an existing customer, https://cloud.elastic.co/login[log in to Elastic Cloud]. On the home page, you will see a new option to create serverless projects.
+
 Choose the type of project that matches your needs and we'll help you get started with our solution guides.
 
 [cols="1,1"]

serverless/pages/manage-billing-stop-project.asciidoc

@@ -4,8 +4,6 @@
 // :description: How to stop charges for a project.
 // :keywords: serverless, general, billing
 
-preview:[]
-
 Got a project you no longer need and don't want to be charged for? Simply delete it.
 
 Warning: All data is lost. Billing for usage is by the hour and any outstanding charges for usage before you deleted the project will still appear on your next bill.

serverless/pages/manage-org.asciidoc

@@ -47,8 +47,6 @@ In the **Actions** column, click the three dots to edit a member's role or revok
 // :description: Manage the predefined set of roles and privileges for all your projects.
 // :keywords: serverless, general, organization, roles, how to
 
-preview:[]
-
 Within an organization, users can have one or more roles and each role grants specific privileges.
 
 You must assign user roles when you <<general-manage-access-to-organization,invite users to join your organization>>.
@@ -133,9 +131,6 @@ If you're the only user in the organization, you can only leave if you have dele
 [[general-join-organization-from-existing-cloud-account]]
 == Join an organization from an existing Elastic Cloud account
 
-// :description: Join a new organization and bring over your projects.
-// :keywords: serverless, general, organization, join, how to
-
 If you already belong to an organization, and you want to join a new one, it is currently not possible to bring your projects over to the new organization.
 
 If you want to join a new project, follow these steps:

serverless/pages/project-settings-access.asciidoc

@@ -8,8 +8,6 @@
 <titleabbrev>Access</titleabbrev>
 ++++
 
-preview:[]
-
 Go to **Project settings**, then ** Management** to manage your indices, data views, saved objects, settings, and more.
 You can also open Management by using the {kibana-ref}/kibana-concepts-analysts.html#_finding_your_apps_and_objects[global search field].
 

serverless/pages/project-settings-content.asciidoc

@@ -8,8 +8,6 @@
 <titleabbrev>Content</titleabbrev>
 ++++
 
-preview:[]
-
 Go to **Project settings**, then ** Management** to manage your indices, data views, saved objects, settings, and more.
 You can also open Management by using the {kibana-ref}/kibana-concepts-analysts.html#_finding_your_apps_and_objects[global search field].