solved conflict

Conflicts:
hello/hello/word_stats/static/js/common.js
111