reaction
reaction conflict resolve