change2 by client1 without fetching
Merge conflicts