added documents
conflict resolution with documents