transitioning to HSQLDB instead of MySQL
updating merge