changed in doc1, testB
Resolved conflict