increased database conflict timeout to 12hours