Merge spa-admin manually