add a line to the testpull.txt: in the mac client
solve the conflict in file : testpull.txt