fixed after merge conflict + add fillDb script