merge upload documents changes
Merge with remote master after conflict resolve