add missing /*local*/
fix conflict