Fixing git merge on Database.java