last merge tweak to get everything running in azure