Fix merge conflicts.

extensions/amp-story/validator-amp-story.protoascii

@@ -1015,6 +1015,51 @@ tags: { # Same code as `<amp-story-page-attachment> with href`
  mandatory_num_child_tags: 0
  }
 }
+tags: { # Same code as `<amp-story-page-attachment> with href`
+ html_format: AMP
+ tag_name: "AMP-STORY-PAGE-OUTLINK"
+ spec_name: "amp-story-page-outlink"
+ mandatory_ancestor: "AMP-STORY-PAGE"
+ mandatory_last_child: true
+ attrs: {
+ name: "layout"
+ mandatory: true
+ value: "nodisplay"
+ }
+ attrs: {
+ name: "theme"
+ value: "custom"
+ value: "dark"
+ value: "light"
+ }
+ attrs: {
+ name: "cta-accent-color"
+ }
+ attrs: {
+ name: "cta-accent-element"
+ value: "background"
+ value: "text"
+ }
+ attrs: {
+ name: "href"
+ mandatory: true
+ value_url: {
+ protocol: "http"
+ protocol: "https"
+ }
+ }
+ attrs: {
+ name: "cta-image"
+ value_url: {
+ # protocol: "http" # TODO(honeybaderdontcare): readd once transformers in prod
+ protocol: "https"
+ allow_relative: false # TODO(honeybaderdontcare): remove once transformers in prod
+ }
+ }
+ child_tags: {
+ mandatory_num_child_tags: 0
+ }
+}
 tags: { # <amp-story-animation> <script>
  html_format: AMP
  tag_name: "SCRIPT"