Changed hello.html to say hello to John
Resolved conflict in hello.html