codingeverybody2
resolved conflict helloworld.html