Remove a git conflict
Merge branch 'release-1.0.2' of https://github.com/skysql/MariaDB-Manager-GREX into release-1.0.2