Fix merge script output.

Author: Ian Gordon

CHANGELOG.md

@@ -1,21 +1,9 @@
-<<<<<<< HEAD
-# 12.1.1
-=======
 # 12.2.0
->>>>>>> release-candidate
 
 ## API diffs
 
 Auto-generated by running:
 
-<<<<<<< HEAD
-    scripts/api_diff -o ec923edf948c5c0ef8cef52f3a3b26a21cbf29d9 -n 34f12cf42f45e30bada83ff6c4c67d5104201a00
-
-No public API changes detected.
-
-## Component changes
-
-=======
     scripts/api_diff -o c6523eae8e811b1c89d94073b9153a03390b1950 -n edab0db4908985cd0b56003b4341d5f064f98d6a
 
 ### Dialogs
@@ -55,23 +43,25 @@ No public API changes detected.
 
 * [Add missing website API and usage docs.](https://github.com/google/material-components-ios/commit/493331502c44f6e844ffbdfdf21d439ce4ba455b) (Adrian Secord)
 
->>>>>>> release-candidate
-### SpritedAnimationView
 
-#### Changes
+# 12.1.1
 
-<<<<<<< HEAD
-* [Added intrinsicContentSize.](https://github.com/google/material-components-ios/commit/34f12cf42f45e30bada83ff6c4c67d5104201a00) (randallli)
+## API diffs
 
-=======
-* [Add intrinsicContentSize.](https://github.com/google/material-components-ios/commit/32614d0fb4f9621fa03933d20866095c6890c926) (randallli)
+Auto-generated by running:
 
-### Switch
+    scripts/api_diff -o ec923edf948c5c0ef8cef52f3a3b26a21cbf29d9 -n 34f12cf42f45e30bada83ff6c4c67d5104201a00
+
+No public API changes detected.
+
+## Component changes
+
+### SpritedAnimationView
 
 #### Changes
 
-* [#524 - Fix RTL support](https://github.com/google/material-components-ios/commit/9f328d5eca12116ae9a03089377613f4176ddb51) (Justin Shephard)
->>>>>>> release-candidate
+* [Added intrinsicContentSize.](https://github.com/google/material-components-ios/commit/34f12cf42f45e30bada83ff6c4c67d5104201a00) (randallli)
+
 
 # 12.1.0