diff --git a/dev-requirements.txt b/dev-requirements.txt
index fb0b229..07b445f 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -9,33 +9,50 @@ asgiref==3.6.0
 attrs==22.2.0
     # via pytest
 black==23.3.0
+<<<<<<< HEAD
     # via pytest-black
 build==0.10.0
     # via pip-tools
 chardet==4.0.0
     # via diff-cover
+=======
+    # via flake8-black
+build==0.10.0
+    # via pip-tools
+>>>>>>> 7d1f998 (use pip-compile to generate requirements.txt)
 click==8.1.3
     # via
     #   black
     #   pip-tools
+<<<<<<< HEAD
 coverage[toml]==7.2.2
     # via pytest-cov
 diff-cover==4.2.3
     # via la-chariotte (pyproject.toml)
+=======
+>>>>>>> 7d1f998 (use pip-compile to generate requirements.txt)
 django==4.2
     # via la-chariotte (pyproject.toml)
 exceptiongroup==1.1.1
     # via pytest
+<<<<<<< HEAD
 importlib-metadata==6.1.0
     # via inflect
 inflect==3.0.2
     # via
     #   diff-cover
     #   jinja2-pluralize
+=======
+flake8==6.0.0
+    # via flake8-black
+flake8-black==0.3.6
+    # via la-chariotte (pyproject.toml)
+>>>>>>> 7d1f998 (use pip-compile to generate requirements.txt)
 iniconfig==2.0.0
     # via pytest
 isort==5.12.0
     # via pytest-isort
+<<<<<<< HEAD
 jinja2==3.1.2
     # via
     #   diff-cover
@@ -44,6 +61,10 @@ jinja2-pluralize==0.3.0
     # via diff-cover
 markupsafe==2.1.2
     # via jinja2
+=======
+mccabe==0.7.0
+    # via flake8
+>>>>>>> 7d1f998 (use pip-compile to generate requirements.txt)
 mypy-extensions==1.0.0
     # via black
 packaging==23.0
@@ -58,6 +79,7 @@ pip-tools==6.12.3
 platformdirs==3.2.0
     # via black
 pluggy==1.0.0
+<<<<<<< HEAD
     # via
     #   diff-cover
     #   pytest
@@ -65,11 +87,21 @@ psycopg2-binary==2.9.6
     # via la-chariotte (pyproject.toml)
 pygments==2.14.0
     # via diff-cover
+=======
+    # via pytest
+psycopg2==2.9.6
+    # via la-chariotte (pyproject.toml)
+pycodestyle==2.10.0
+    # via flake8
+pyflakes==3.0.1
+    # via flake8
+>>>>>>> 7d1f998 (use pip-compile to generate requirements.txt)
 pyproject-hooks==1.0.0
     # via build
 pytest==7.2.2
     # via
     #   la-chariotte (pyproject.toml)
+<<<<<<< HEAD
     #   pytest-black
     #   pytest-cov
     #   pytest-django
@@ -78,18 +110,26 @@ pytest-black==0.3.12
     # via la-chariotte (pyproject.toml)
 pytest-cov==4.0.0
     # via la-chariotte (pyproject.toml)
+=======
+    #   pytest-django
+    #   pytest-isort
+>>>>>>> 7d1f998 (use pip-compile to generate requirements.txt)
 pytest-django==4.5.2
     # via la-chariotte (pyproject.toml)
 pytest-isort==3.1.0
     # via la-chariotte (pyproject.toml)
 sqlparse==0.4.3
     # via django
+<<<<<<< HEAD
 toml==0.10.2
     # via pytest-black
+=======
+>>>>>>> 7d1f998 (use pip-compile to generate requirements.txt)
 tomli==2.0.1
     # via
     #   black
     #   build
+<<<<<<< HEAD
     #   coverage
     #   pyproject-hooks
     #   pytest
@@ -97,6 +137,12 @@ wheel==0.40.0
     # via pip-tools
 zipp==3.15.0
     # via importlib-metadata
+=======
+    #   flake8-black
+    #   pytest
+wheel==0.40.0
+    # via pip-tools
+>>>>>>> 7d1f998 (use pip-compile to generate requirements.txt)
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip