Removing conflict-classes