adjusted update for conflict handling