diff --git a/Makefile b/Makefile
index 18dfe98e..2456ccae 100644
--- a/Makefile
+++ b/Makefile
@@ -20,11 +20,7 @@ cov cover coverage: pre-commit
 mototest:
 	docker pull alpine
 	docker pull lambci/lambda:python3.8
-<<<<<<< HEAD
-	BOTO_CONFIG=/dev/null python -Wd -X tracemalloc=5 -X faulthandler -m pytest -vv -m moto -n auto --cov-report term --cov-report html --cov-report xml --cov=aiobotocore --cov=tests --log-cli-level=DEBUG --http-backend=$(HTTP_BACKEND) $(FLAGS) aiobotocore tests
-=======
-	python -Wd -X tracemalloc=5 -X faulthandler -m pytest -vv -m moto -n auto --cov-report term --cov-report html --cov-report xml --cov=aiobotocore --cov=tests --log-cli-level=DEBUG $(FLAGS) aiobotocore tests
->>>>>>> origin/master
+	python -Wd -X tracemalloc=5 -X faulthandler -m pytest -vv -m moto -n auto --cov-report term --cov-report html --cov-report xml --cov=aiobotocore --cov=tests --log-cli-level=DEBUG --http-backend=$(HTTP_BACKEND) $(FLAGS) aiobotocore tests
 	@echo "open file://`pwd`/htmlcov/index.html"
 
 clean:
diff --git a/requirements-dev.in b/requirements-dev.in
index 317c6d5a..1c2d5520 100644
--- a/requirements-dev.in
+++ b/requirements-dev.in
@@ -21,25 +21,7 @@ dill~=0.3.3  # Requirement for tests/test_patches.py
 docker~=7.1
 moto[server,s3,sqs,awslambda,dynamodb,cloudformation,sns,batch,ec2,rds]~=4.2.9
 pre-commit~=3.5.0
-<<<<<<< HEAD
-pytest==7.4.0
-pytest-cov==4.1.0
-pytest-asyncio~=0.21.1
-pytest-xdist==3.3.1
-setuptools==67.8.0;python_version>="3.12"
-
-# this is needed for test_patches
-dill~=0.3.3
-
-# this is needed when running setup.py check -rms
-Pygments
-
-httpx
-# needed for tests.mock_server and tests.moto_server
-aiohttp${AIOHTTP_VERSION}
-
--e .[awscli,boto3]
-=======
 pytest-asyncio~=0.23.8
 tomli; python_version < "3.11"  # Requirement for tests/test_version.py
->>>>>>> origin/master
+
+httpx