Fixed merge conflict in DatabaseController