Updated for conflict