added new message
merge completed
renamed hello3.js to hello.js - reverted to original form