merge conflict

Author: Saurabh Singh

.gitignore

@@ -1,2 +1,22 @@
-# Created by venv; see https://docs.python.org/3/library/venv.html
-*
+.DS_Store
+*.pyc
+.vscode-test
+__pycache__
+**/.vscode-test/**
+**/.vscode test/**
+**/.vscode-smoke/**
+**/.venv*/
+bin/**
+build/**
+obj/**
+.pytest_cache
+tmp/**
+.vs/
+dist/**
+*.egg-info/*
+.vscode
+examples/**/*.jpg
+.python-version
+.coverage
+*coverage.xml
+.ruff_cache