pause and reverse effects
resolve conflict