Fixed merge problem that was impeding to commit npm package (Jul 31, 2013,12:04 PM)