move HTML out of JavaScript code
fixed merge conflict