fix: Resolve merge conflicts

Author: Sooshiance

setup.py

@@ -1,20 +1,20 @@
-from setuptools import setup  # type: ignore
+from setuptools import setup   # type: ignore
 
 setup(
-    name="JSON-log-formatter",
-    version="1.1",
-    license="MIT",
-    packages=["json_log_formatter"],
-    author="Marsel Mavletkulov",
-    url="https://github.com/marselester/json-log-formatter",
-    description="JSON log formatter",
-    long_description=open("README.rst").read(),
+    name='JSON-log-formatter',
+    version='1.1',
+    license='MIT',
+    packages=['json_log_formatter'],
+    author='Marsel Mavletkulov',
+    url='https://github.com/marselester/json-log-formatter',
+    description='JSON log formatter',
+    long_description=open('README.rst').read(),
     classifiers=[
-        "License :: OSI Approved :: MIT License",
-        "Intended Audience :: Developers",
-        "Operating System :: OS Independent",
-        "Programming Language :: Python",
-        "Programming Language :: Python :: 3",
-        "Topic :: Software Development :: Libraries :: Python Modules",
+        'License :: OSI Approved :: MIT License',
+        'Intended Audience :: Developers',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 3',
+        'Topic :: Software Development :: Libraries :: Python Modules'
     ],
 )