merge master

Author: markzegarelli

src/connections/destinations/catalog/google-analytics/ga4-plans.md

@@ -28,7 +28,7 @@ If you decide to use GA4 so you can compare the data, you should spend some time
 
 GA4’s out-of-the-box reports are different from UA’s. GA4’s reporting is much more configurable, and supports new reporting metrics like churn probability and predictive revenue estimates.
 
-You might not be able to perfectly recreate your UA reports in GA4. One approach is to send your data to both UA and G4A while you build out your new reports in G4A, and improve those reports over time. Once you are satisfied that your G4A reports meet your needs, you can gradually migrate away from using the original reporting in UA.
+You might not be able to perfectly recreate your UA reports in GA4. One approach is to send your data to both UA and GA4 while you build out your new reports in GA4, and improve those reports over time. Once you are satisfied that your GA4 reports meet your needs, you can gradually migrate away from using the original reporting in UA.
 
 
 ## Client-based or server-based

src/connections/destinations/catalog/pinterest-audiences/index.md

@@ -14,12 +14,20 @@ For more information about advertising with Pinterest, see:
 - A Pinterest Ads account with the `owner`, `admin`, or `audience_manager` role
 
 **Supported identifiers**
+<<<<<<< HEAD
 - email
+=======
+- Email
+>>>>>>> master
 - iOS IDFA
 - Android ID
 
 > warning ""
+<<<<<<< HEAD
 > **Note**: The Segment iOS SDK version 4.0 and up does not collect automatically collect IDFA. For more information, see the [iOS 14 Guide](docs/connections/sources/catalog/libraries/mobile/ios/ios14-guide/).
+=======
+> **Note**: The Segment iOS SDK version 4.0 and up does not collect automatically collect IDFA. For more information, see the [iOS 14 Guide](/docs/connections/sources/catalog/libraries/mobile/ios/ios14-guide/).
+>>>>>>> master
 
 **Connection type**
 - Server-side
@@ -39,15 +47,28 @@ The Pinterest Audiences destination syncs data from Segment Personas to Pinteres
     3. The configured Pinterest Audiences destination should appear in the Send as User List category of available destinations.
     4. Select the destination, and click Add Destination.
 
+<<<<<<< HEAD
 ## FAQ
 
 ### What does the audience size represent? 
 It's the final count of matched users - so the actual targetable audience size.
 The audience size represented in Segment is the final count of matched users between your customer profiles in Segment and Pinterest users. This number denotes your targetable audience size within Pinterest.
+=======
+The initial synchronization of audience data may take several hours, depending on the size of the audience. Once the initial sync occurs, you'll see a new audience in the Pinterest Audiences dashboard.
+
+## FAQ
+
+### What does the audience size represent? 
+The audience size represented in Pinterest is the final count of matched users between your customer profiles in Segment and Pinterest users. This number denotes your targetable audience size within Pinterest.
+>>>>>>> master
 
 The initial synchronization of audience data may take several hours, depending on the size of the audience. Once the initial sync occurs, you’ll see a new Audience in the Pinterest Audiences dashboard.
 
 ### Are lists/audiences processed on some interval, or on customer list update? Do we need to wait 24-48 hours every time we add/remove identifiers from a list? 
 Processing happens regularly and automatically throughout the day - but can take up to 24 hours. 
 
-You do not need to wait to continue sending data; however, any campaigns using those audiences will not see the changes until after processing (they'll continue running against whatever users have already been matched).
+<<<<<<< HEAD
+You do not need to wait to continue sending data; however, any campaigns using those audiences will not see the changes until after processing (they'll continue running against whatever users have already been matched).
+=======
+You do not need to wait to continue sending data; however, any campaigns using those audiences will not see the changes until after processing (they'll continue running against whatever users have already been matched).
+>>>>>>> master