Changed in doc1, test-a
Resolved conflict