fix merge conflicts

Author: hillbrad

specs/CSP2/index.src.html

@@ -2313,7 +2313,7 @@ <h3 id="directive-frame-ancestors"><code>frame-ancestors</code></h3>
     following ABNF grammar:
 
     <pre>
-      <dfn>ancestor-source-list</dfn> = [ <a>ancestor-source</a> *( 1*WSP <a>ancestor-source</a> ) ] / "'none'"
+      <dfn>ancestor-source-list</dfn> = [ <a>ancestor-source</a> *( 1*WSP <a>ancestor-source</a> ) ] / "'none'" / "'self'"
       <dfn>ancestor-source</dfn>      = <a>scheme-source</a> / <a>host-source</a>
 
       directive-name  = "frame-ancestors"
@@ -2349,7 +2349,6 @@ <h3 id="directive-frame-ancestors"><code>frame-ancestors</code></h3>
               <li>Abort loading the protected resource.</li>
 
               <li>Take one of the following actions:
-                
                 <ul>
                   <li>
                     Act as if it received an empty <a>HTTP 200 response</a>.

specs/content-security-policy/index.src.html

@@ -2415,7 +2415,7 @@ <h3 id="directive-frame-ancestors"><code>frame-ancestors</code></h3>
     following ABNF grammar:
 
     <pre>
-      <dfn>ancestor-source-list</dfn> = [ <a>ancestor-source</a> *( 1*<a>WSP</a> <a>ancestor-source</a> ) ] / "'none'"
+      <dfn>ancestor-source-list</dfn> = [ <a>ancestor-source</a> *( 1*<a>WSP</a> <a>ancestor-source</a> ) ] / "'none'" / "'self'"
       <dfn>ancestor-source</dfn>      = <a>scheme-source</a> / <a>host-source</a>
 
       directive-name  = "frame-ancestors"