update with potential conflict?