more merge conflicts

Author: markzegarelli

src/connections/destinations/catalog/adwords-remarketing-lists/index.md

@@ -14,11 +14,8 @@ This destination can send audiences created in [Personas](/docs/personas/) to Go
 
 You can send either an email address or mobile device ID (IDFA) from Segment Personas to Google as custom matchers. You can set an email address on the user profile by including `email` as a trait on an [`identify` call](/docs/connections/spec/identify/), as a property on a [`track` call](/docs/connections/spec/track/), or as an [external id](/docs/personas/identity-resolution/externalids/) for the user. If you use Segment’s mobile SDKs to collect events from a mobile app, the user’s IDFA is automatically captured. If you don't use Segment’s mobile SDKs, you can set the user’s IDFA by setting it within `context.device.advertisingId`.
 
-<<<<<<< HEAD
-=======
 Currently, you can only send either an email address or mobile id (IDFA) from Segment Personas to Google as custom matchers. You can set an email address on the user profile by including `email` as a trait on an [`identify` call](/docs/connections/spec/identify/), as a property on a [`track` call](/docs/connections/spec/track/), or as an [external id](/docs/personas/identity-resolution/externalids/) for the user.
 If you use Segment's mobile SDK to collect events from a mobile app, the user's IDFA is automatically captured. If you don't use Segment's mobile SDK, you can set the user's IDFA by setting it within `context.device.advertisingId`.
->>>>>>> master
 
 When you send an audience to Google Ads Remarketing Lists, you can choose which custom matcher (email or mobile device ID/IDFA) to match with. If a user has multiple emails or IDFAs on their account as `external_ids`, Personas only sends the ID that was most recently added to the user profile to Google Ads.
 
@@ -51,13 +48,7 @@ Create an audience of users that signed up, purchased a product, or otherwise pe
 
 ### Similar audience
 
-<<<<<<< HEAD
-
-You can use Personas to create a detailed profile of your most loyal customers (sometimes called a “seed audience”) and then send this list of customers to Google. In Google, you can then use Google’s [Similar Audience](https://support.google.com/google-ads/answer/7151628){:target="_blank"} features to find similar users to target. For example, you might want to create a group of high-value users who have spent a certain amount of money on your product, and then use Similar Audiences to find users who might also spend that much.
-
-=======
 You can use Personas to create a detailed profile of your most loyal customers (sometimes called a “seed audience”) and then send this list of customers to Google. In Google, you can then use Google's [Similar Audience](https://support.google.com/google-ads/answer/7151628?hl=en-AU) features to find similar users to target. For example, you might want to create a group of high-value users who have spent a certain amount of money on your product, and then use Similar Audiences to find users who might also spend that much.
->>>>>>> master
 
 > note ""
 > **Note:** A “seed audience” must have at least 100 members for Google's Similar Audience feature to function.
@@ -131,14 +122,9 @@ Personas matches users in your audience using email and mobile device ID (IDFA)
 
 You can set an email address on the user profile by including `email` as a trait on an [`identify` call](/docs/connections/spec/identify/), as a property on a [`track` call](/docs/connections/spec/track/), or as an [external id](/docs/personas/identity-resolution/externalids/) for the user. If you use Segment’s mobile SDKs to collect events from a mobile app, the user’s IDFA is automatically captured. If you don't use Segment’s mobile SDKs, you can set the user’s IDFA by setting it within `context.device.advertisingId`.
 
-<<<<<<< HEAD
-If a user has multiple emails or IDFAs on their account as `external_ids`, Personas only sends the ID that was most recently added to the user profile to Google Ads for matching. The match rate will be low if Google can’t identify users based on the data that you provide.
-
-=======
 You can set an email on the user profile by including `email` as a trait, as a property on an event, or as an external id for the user. If you use Segment's mobile SDKs to collect events from a mobile app, IDFA is automatically captured for the user. You can also set a user's IDFA on a mobile app by setting it within `context.device.advertisingId`.
 
 If a user has more than one email address or IDFA on their account as `external_ids`, Personas only sends the most recent id on the user profile to Adwords for matching. The match rate will be low if Google can't identify users based on the data that you provide.
->>>>>>> master
 
 ## FAQs
 

src/connections/storage/catalog/data-lakes/index.md

@@ -20,11 +20,7 @@ Before you set up Segment Data Lakes, you need the following resources:
 
 ## Step 1 - Set Up AWS Resources
 
-<<<<<<< HEAD
-You can use the [open source Terraform module](https://github.com/segmentio/terraform-aws-data-lake) to automate much of the set up work to get Data Lakes up and running. If you're familiar with Terraform, you can modify the module to meet your organization's needs, however Segment guarantees support only for the template as provided. The Data Lakes set up uses Terraform v0.11+. To support more versions of Terraform, the aws provider must use v2, which is included in our example main.tf.
-=======
-You can use the [open source Terraform module](https://github.com/segmentio/terraform-aws-data-lake) to automate much of the set up work to get Data Lakes up and running. If you’re familiar with Terraform, you can modify the module to meet your organization’s needs, however Segment guarantees support only for the template as provided. The Data Lakes set up uses Terraform v0.12+. To support more versions of Terraform, the AWS provider must use v4, which is included in our example main.tf.
->>>>>>> master
+You can use the [open source Terraform module](https://github.com/segmentio/terraform-aws-data-lake) to automate much of the set up work to get Data Lakes up and running. If you’re familiar with Terraform, you can modify the module to meet your organization’s needs, however Segment guarantees support only for the template as provided. The Data Lakes set up uses Terraform v0.12+. To support more versions of Terraform, the AWS provider must use v4, which is included in the example main.tf.
 
 You can also use Segment's [manual set up instructions](/docs/connections/storage/data-lakes/data-lakes-manual-setup) to configure these AWS resources if you prefer.
 

src/privacy/complying-with-the-gdpr.md

@@ -64,21 +64,4 @@ Segment offers a Data Processing Agreement (DPA) and Standard Contractual (SCCs)
 Segment offers a Data Processing Agreement (DPA) and Standard Contractual Clauses (SCCs) as a means of meeting the regulatory contractual requirements of GDPR in our role as processor and also to address international data transfers. 
 
 > note ""
-<<<<<<< HEAD
-> **Note on Schrems II**: Despite the CJEU's July 2020 ruling invalidating Privacy Shield as a means of validly transferring data to the USA from the EU, these developments are not expected to disrupt Segment's ability to provide services to its EU customers as the European Court of Justice has reaffirmed that the Standard Contractual Clauses (SCC) remain valid as a method of transfer. Our standard Data Processing Agreement includes a provision whereby should Privacy Shield ever be invalidated (as is the case now) then the SCCs will automatically apply.
-
-To opt into the Data Processing Agreement and Standard Contractual Clauses:
-
-1.  Go to your [Workspace](https://app.segment.com).
-2.  Open the left side menu and select **Settings**.
-3.  Below **End User Privacy**, click **Privacy & Security.**
-4.  Below **Data Processing Agreement**, click **Review**.
-5.  Review and sign within Docusign.
-
-If you also wish to opt into the Standard Contractual Clauses:
-
-1.  Below **Standard Contractual Clauses**, click **Review**.
-2.  Review and sign within Docusign.
-=======
 > **Note on Schrems II**: Despite the CJEU’s July 2020 ruling invalidating Privacy Shield as a means of validly transferring data to the USA from the EU, these developments are not expected to disrupt Segment’s ability to provide services to its EU customers as the European Court of Justice has reaffirmed that the Standard Contractual Clauses (SCC) remain valid as a method of transfer. Our standard Data Processing Agreement includes a provision whereby should Privacy Shield ever be invalidated (as is the case now) then the SCCs will automatically apply.
->>>>>>> master