Track 'main' to resolve merge conflict.

Author: amartini51

TSPL.docc/ReferenceManual/Types.md

@@ -44,8 +44,8 @@ and describes the type inference behavior of Swift.
 > *type* → *optional-type* \
 > *type* → *implicitly-unwrapped-optional-type* \
 > *type* → *protocol-composition-type* \
-> *type* → *boxed-protocol-type* \
 > *type* → *opaque-type* \
+> *type* → *boxed-protocol-type* \
 > *type* → *parameter-pack-type*
 > *type* → *metatype-type* \
 > *type* → *any-type* \