fixed + optimized  angular controller path
resolved conflict