Remove conflicts and provides