db conflict fixed