Adds Hello world
Solves conflicts