fix merge conflicts

boilerplate/act-rules-format/copyright.include

@@ -0,0 +1 @@
+<a href="https://www.w3.org/policies/#copyright">Copyright</a> © 2024 <a href="https://www.w3.org/">World Wide Web Consortium</a>. <abbr title="World Wide Web Consortium">W3C</abbr><sup>®</sup> <a href="https://www.w3.org/policies/#Legal_Disclaimer">liability</a>, <a href="https://www.w3.org/policies/#W3C_Trademarks">trademark</a> and <a href="https://www.w3.org/copyright/document-license/">document use</a> rules apply.

boilerplate/act-rules-format/status.include

@@ -0,0 +1,25 @@
+<p><em>This section describes the status of this document at the time of its publication. A list of current <abbr title="World Wide Web Consortium">W3C</abbr> publications and the latest revision of this technical report can be found in the <a href="https://www.w3.org/TR/"><abbr title="World Wide Web Consortium">W3C</abbr> technical reports index</a> at https://www.w3.org/TR/.</em></p>
+
+<p include-if="ED">This is an Editor Draft of Accessibility Conformance Testing (ACT) Rules Format [LEVEL], prepared by the <a href="http://www.w3.org/wai/gl/task-forces/conformance-testing/">Accessibility Conformance Testing (ACT) Task Force</a> of the <a href="https://www.w3.org/WAI/GL/">Accessibility Guidelines Working Group (AGWG)</a>. This document is an Editor Draft and does not represent consensus of the <a href="https://www.w3.org/WAI/GL/">Accessibility Guidelines Working Group</a>. This document is intended to become a <abbr title="World Wide Web Consortium">W3C</abbr> Recommendation after further review and refinement.</p>
+
+<p include-if="ED">This is an Editor Draft for review and refinement within ACT TF and AGWG. It is not ready for public comments. Before commenting, please first review the <a href="https://github.com/w3c/wcag-act/"><abbr title="World Wide Web Consortium">W3C</abbr> ACT TF GitHub repository</a> for related comments. New comments can be submitted as <a href="https://github.com/w3c/wcag-act/issues/new">new GitHub issues</a> or by email to <a href="mailto:[email protected]?subject=ACT%20Fomrmat%201.1%20public%20comment">[email protected]</a> (<a href="https://lists.w3.org/Archives/Public/public-wcag-act-comments/">pullic list archive</a>).</p>
+
+<p include-if="ED">Publication as an Editor Draft does not imply endorsement by
+ <abbr title="World Wide Web Consortium">W3C</abbr> and its Members. This is a draft document and may be updated, replaced or obsoleted by other documents at any time. It is inappropriate to cite this document as other than work in progress.</p>
+
+<p include-if="FPWD">This is a First Public Working Draft of Accessibility Conformance Testing (ACT) Rules Format [LEVEL] by the <a href="https://www.w3.org/groups/wg/ag/">Accessibility Guidelines Working Group</a>. ACT-Rules Format [LEVEL] is a complete draft, addressing all of the <a href="https://w3c.github.io/wcag-act/act-fr-reqs.html">requirements</a> the ACT Task Force believes are important to cover when writing rules. The ACT-Rules Format is based on rules developed by the <a href="https://act-rules.github.io/">ACT-Rules Community Group</a>.</p>
+
+<p>[STATUSTEXT]
+
+<p>To comment, <a href="https://github.com/w3c/wcag-act/issues/new">file an issue in the <abbr title="World Wide Web Consortium">W3C</abbr> ACT GitHub repository</a>. It is free to create a GitHub account to file issues. If filing issues in GitHub is not feasible, send email to <a href="mailto:[email protected]?subject=ACT%20Format%201.1%20public%20comment">[email protected]</a> (<a href="https://lists.w3.org/Archives/Public/public-wcag-act-comments/">comment archive</a>). Comments are requested by <strong>[DEADLINE]</strong>. In-progress updates to the document may be viewed in the <a href="https://w3c.github.io/wcag-act/act-rules-format.html">publicly visible editors' draft</a>.</p>
+
+<p include-if="FPWD">This document was published by the <a href="https://www.w3.org/groups/wg/ag/">Accessibility Guidelines Working Group</a> as a First Public Working Draft using the <a
+ href='https://www.w3.org/policies/process/20231103/#recs-and-notes'>Recommendation
+ track</a>. This document is intended to become a <abbr title="World Wide Web Consortium">W3C</abbr> Recommendation.</p>
+
+<p include-if="FPWD">Publication as a First Public Working Draft does not imply endorsement by
+ <abbr title="World Wide Web Consortium">W3C</abbr> and its Members. This is a draft document and may be updated, replaced or obsoleted by other documents at any time. It is inappropriate to cite this document as other than work in progress.</p>
+
+<p>This document was produced by a group operating under the <a href="https://www.w3.org/Consortium/Patent-Policy/">W3C Patent Policy</a>. W3C maintains a <a rel="disclosure" href="https://www.w3.org/groups/wg/ag/ipr/">public list of any patent disclosures</a> made in connection with the deliverables of the group; that page also includes instructions for disclosing a patent. An individual who has actual knowledge of a patent which the individual believes contains <a href="https://www.w3.org/Consortium/Patent-Policy/#def-essential">Essential Claim(s)</a> must disclose the information in accordance with <a href="https://www.w3.org/Consortium/Patent-Policy/#sec-Disclosure">section 6 of the W3C Patent Policy</a>.</p>
+
+<p>This document is governed by the <a id="w3c_process_revision" href="https://www.w3.org/2023/Process-20231103/">03 November 2023 W3C Process Document</a>.