Fix package-lock.json merge conflict
Fix package-lock.json merge conflict

atom/atom,liuderchi/atom,atom/atom,liuderchi/atom,PKRoma/atom,stinsonga/atom,atom/atom,brettle/atom,stinsonga/atom,t9md/atom,t9md/atom,stinsonga/atom,liuderchi/atom,brettle/atom,PKRoma/atom,t9md/atom,brettle/atom,Mokolea/atom,Mokolea/atom,Mokolea/atom,stinsonga/atom,PKRoma/atom,liuderchi/atom