peter's modification server.txt
client.txt modified and resolved conflict in server.txt