Addin Web service
Fixing merge