settle the conflict by adding hello world