client 2 - change 1

Conflicts:
a.txt