Merge service by name
Use real path when adding a file for later merge
update stashmap
Merge client correctly
Merge i18n correctly
reduce