remove conflict flag