chore: enforce code-conflicts workflow#2

tomswinkels wants to merge 1 commit intomainpreprio/python-flask-quick-start:mainfrom

chore/enforce-code-conflicts-callerpreprio/python-flask-quick-start:chore/enforce-code-conflicts-callerCopy head branch name to clipboard