Working with program related documents
Solve conflicts