Conflict Resolution: Act! Don't React!