[BUGFIX] Conflicts with dbal

Resolves: #58522
Merge pull request #16 from MaxServ/master

[BUGFIX] Conflicts with dbal