resolving db conflict