directive fix conflict