add githubTest2 file's edit
resolved conflict helloworld.txt