removing conflict