fixed conflict in .github/workflows/build-and-upload.yml #1

	name: build_main_binary
	on:
	push:
	branches:
	- publish
	jobs:
	build:
	runs-on: ubuntu-latest
	permissions:
	id-token: write
	steps:
	- name: Checkout Code
	uses: actions/checkout@v4.1.1
	- name: Setup Python
	uses: actions/setup-python@v5.0.0
	with:
	python-version: 3.11
	architecture: x64
	- name: Route to project directory
	run: cd develop
	- name: Install Dependencies
	run: pip3 install -r requirements.txt
	- name: Build PyPI package
	run: python3 -m build
	- name: Publish to PyPI
	env:
	PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
	run: twine upload ./dist/* -r pypi -u "__token__" -p "$PYPI_TOKEN"
	continue-on-error: true

Provide feedback