Removing conflict rubbish