How to resolve a git conflict in poetry.lock - Peterbe.com