fixed azure deployment
fixed conflicts