Solve conflict for js-programming-guide branch