Remove conflict and provide directives