HelloWorld and MergeConflict