Resolve database conflicts