merge with surf conext overlay, small change in autodeploy script