Fix merge conflict to show js console in node-webkit