Resolve conflicts (#208)

Makefile

@@ -0,0 +1,24 @@
+# Variables
+PYTHON := python3
+PIP := $(PYTHON) -m pip
+PROJECT_NAME := embedchain
+
+# Targets
+.PHONY: install format lint clean test
+
+install:
+	$(PIP) install --upgrade pip
+	$(PIP) install .[dev]
+
+format:
+	$(PYTHON) -m black .
+	$(PYTHON) -m isort .
+
+lint:
+	$(PYTHON) -m ruff .
+
+clean:
+	rm -rf dist build *.egg-info
+
+test:
+	$(PYTHON) -m pytest