Working on deploying to ESB
Conflict resolving
change in deploy-assets