fix munged conflict resolution

Author: handrews

versions/3.0.4.md

@@ -3702,6 +3702,8 @@ Version   | Date       | Notes
 1.1       | 2012-08-22 | Release of Swagger 1.1
 1.0       | 2011-08-10 | First release of the Swagger Specification
 
+## <a name="usingRFC6570Implementations"></a>Appendix C: Using RFC6570 Implementations
+
 ## <a name="serializingHeadersAndCookies"></a>Appendix D: Serializing Headers and Cookies
 
 RFC6570's percent-encoding behavior is not always appropriate for `in: header` and `in: cookie` parameters.
@@ -3722,7 +3724,3 @@ However, examples of this style in past versions of this specification have not
 Because implementations that rely on an RFC6570 implementation and those that perform custom serialization based on the style example will produce different results, it is implementation-defined as to which of the two results is correct.
 
 For multiple values, `style: form` is always incorrect as name=value pairs in cookies are delimited by `; ` (a semicolon followed by a space character) rather than `&`.
-
-## <a name="usingRFC6570Implementations"></a>Appendix C: Using RFC6570 Implementations
-
-## <a name="serializingHeadersAndCookies"></a>Appendix D: Serializing Headers and Cookies