merge conflict files #28

Job	Run time
Build - Web UI	2m 7s
Filter	10s
Style [pre-commit]	1m 18s
Style [Documentation]	1m 5s
Tests - API Schema Documentation	5m 5s
Tests - Full Migration [SQLite]	0s
Tests - Migrations [PostgreSQL]	0s
Tests - inventree-python	0s
Tests - DB [MySQL]	0s
Style [Typecheck]	0s
Tests - DB [SQLite] + Coverage ${{ matrix.python_version }}	0s
Tests - DB [PostgreSQL]	0s
Tests - Web UI	-1s
Security [Zizmor]	-1s
Tests - Performance	-1s
Push new schema	0s
	9m 42s

Provide feedback