Tag Archive: four steps to resolve conflict