Integration branch merge conflict

Automatic merge of PR #79 (feature/vector_database_tool) into integration failed.

Please resolve conflicts manually:
```bash
git checkout integration
git merge origin/feature/vector_database_tool
# resolve conflicts
git push origin integration
```