remove conflict script remnant