adding conflicts and provides