remove conflict files