remove conflict remains