merge engine work
fix warning
merge engine services updates
update branding icons with right colors and text
merge engine updates