remove conflict file