need to fix conflict in directive+controller amd loading