fixed database
merge