solve the merge conflicts

delete the hello world page