(fix) merge conflict on angular controller
(fix) merge conflict on angular controller

paperMacheTortoise/Hive,paperMacheTortoise/bizGram,onphenomenon/bizGram,paperMacheTortoise/Hive,paperMacheTortoise/bizGram,onphenomenon/bizGram