remove conflict part