Removing conflict