merge with openstack