fixed database conflict error