adding hsqldb
fixes merge conflicts