resolved database conflict