removing conflict flag