updating for atom conflict