add this is codingeverybody2
resolve conflict helloworld.html