fixed db derby
merge