for removing conflict