docsol.windows
ucdatagrid
add folder for wcf
resolve conflict and merge sln