added hello test 1
resolved conflict in test1.txt