Adding MergeConflict, modifying HelloWorld