this is modified by user1.
master hello2.txt
hello2 merged by master