resolve conflicts!
Edit HelloWorld class!