Add doc
Resolve conflict
Sync computers