diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 7764ba4..4e1f3e7 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -16,7 +16,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+<<<<<<< HEAD
         python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
+=======
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+>>>>>>> ce1a0d32bbc349f905f9819527a2114e0688fea2
 
     steps:
     - uses: actions/checkout@v3
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
new file mode 100644
index 0000000..701a70a
--- /dev/null
+++ b/.readthedocs.yaml
@@ -0,0 +1,32 @@
+# .readthedocs.yaml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Set the version of Python and other tools you might need
+build:
+  os: ubuntu-20.04
+  tools:
+    python: "3.10"
+    # You can also specify other tool versions:
+    # nodejs: "16"
+    # rust: "1.55"
+    # golang: "1.17"
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+   configuration: docs/source/conf.py
+
+#If using Sphinx, optionally build your docs in additional formats such as PDF
+formats:
+   - pdf
+
+#Optionally declare the Python requirements required to build your docs
+python:
+  install:
+    - method: pip
+      path: .
+      extra_requirements:
+        - doc
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 01ca47d..a530be3 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -145,7 +145,7 @@ latex_documents = [
 # (source start file, name, description, authors, manual section).
 man_pages = [
     (master_doc, 'pycmx', u'pycmx Documentation',
-     [author], 1)
+     [author], "3p")
 ]
 
 
diff --git a/pycmx/__init__.py b/pycmx/__init__.py
index 80e4951..fde3f9c 100644
--- a/pycmx/__init__.py
+++ b/pycmx/__init__.py
@@ -7,7 +7,7 @@ copy and reuse this software, refer to the LICENSE file included with the
 distribution.
 """
 
-__version__ = '1.2.1'
+__version__ = '1.2.2'
 
 from .parse_cmx_events import parse_cmx3600
 from .transition import Transition
diff --git a/pyproject.toml b/pyproject.toml
index bc0a488..3e2a392 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -20,7 +20,8 @@ classifiers = [
   'Programming Language :: Python :: 3.8',
   'Programming Language :: Python :: 3.9',
   'Programming Language :: Python :: 3.10',
-  'Programming Language :: Python :: 3.11'
+  'Programming Language :: Python :: 3.11',
+  'Programming Language :: Python :: 3.12'
 ]
 homepage = "https://github.com/iluvcapra/pycmx"
 documentation = "https://pycmx.readthedocs.io/"