diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 70954c89..e6ef247e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        python-version: ['3.8', '3.12']
+        python-version: ['3.8', '3.11', '3.12']
         toxenv: [docs, quality, django42]
 
     steps:
diff --git a/edx_django_utils/__init__.py b/edx_django_utils/__init__.py
index 774452b3..dba7a3da 100644
--- a/edx_django_utils/__init__.py
+++ b/edx_django_utils/__init__.py
@@ -2,11 +2,7 @@
 EdX utilities for Django Application development..
 """
 
-<<<<<<< HEAD
-__version__ = "5.11.0"
-=======
-__version__ = "5.10.2"
->>>>>>> fd3417d (build: adding python 312 support.)
+__version__ = "5.12.0"
 
 default_app_config = (
     "edx_django_utils.apps.EdxDjangoUtilsConfig"
diff --git a/tox.ini b/tox.ini
index c4a796be..7aa97191 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{38, 312}-django{42}, docs, quality
+envlist = py{38, 311, 312}-django{42}, docs, quality
 
 [doc8]
 ignore = D000, D001
@@ -37,10 +37,7 @@ norecursedirs = .* docs requirements
 
 [testenv]
 deps =
-<<<<<<< HEAD
     setuptools
-=======
->>>>>>> fd3417d (build: adding python 312 support.)
     django42: Django>=4.2,<4.3
     -r{toxinidir}/requirements/test.txt
 commands =