removing conflict code