anchor.diff:  
   <%=vars.gen_GSG%>
   
  -<<<<<<< HEAD
  +
   ### <a id='yourapp-step6'></a>Step 6: (Optional) Configure a Production Server  ###
  -=======
  +
   
   ### Step 6: (Optional) Configure a Production Server  ###
  ->>>>>>> 0869bc7ecb81ae7f2a5880c4e6edf01e15005375
   
   <%=vars.product_short%> uses the default Ruby web server library WEBrick for Ruby and RoR apps. However, <%=vars.product_short%> can support a more robust production web server, such as Phusion Passenger, Puma, Thin, or Unicorn. To set a different production web server for your app:
   
  
positive.code: 
      </pre>
  
  <<<<<<< HEAD
  For information on how to configure a manifest file, refer to [Step 4: Configure the Manifest File](#yourapp-step4). 
  
  ### <a id='yourapp-step3'></a>Step 3: Create and Bind a Service Instance for Your RoR Application ###
  =======
  ### Step 3: Configure a Service Instance for Your RoR Application ###
  >>>>>>> 0869bc7ecb81ae7f2a5880c4e6edf01e15005375
  
  This section describes using the CLI to configure a PostgreSQL managed service instance for your app. <%=vars.dev_console_1%>
  
  <%=vars.product_short%> supports two types of service instances:
  
  <<<<<<< HEAD
  * Managed services integrate with <%=vars.product_short%> through service brokers that offer services and plans and manage the service calls between <%=vars.product_short%> and a service provider. 
  * User-provided service instances enable you to connect your application to pre-provisioned external service instances.
  
  
negative.code: #### Create a Service Instance ####
  
  Run `cf marketplace` to view managed and user-provided services and plans available to you. 
  
  * Managed services integrate with <%=vars.product_short%> through service brokers that offer services and plans and manage the service calls between <%=vars.product_short%> and a service provider.
  * User-provided service instances enable you to bind your application to pre-provisioned external service instances.
  
  For more information on creating and using service instances, refer to the [Services Overview](./../../devguide/services/index.html) topic.
  
  Run `cf marketplace` to view managed and user-provided services and plans available to you.
  
  The example shows three of the available managed database-as-a-service providers and their offered plans: `cleardb` MySQL, `elephantsql` PostgreSQL as a Service, and `mongolab` MongoDB-as-a-Service.
  
  