remove conflict generating action