fix merge conflict
fix merge conflict

Metaswitch/fuel-library,zhaochao/fuel-library,ddepaoli3/fuel-library-dev,SmartInfrastructures/fuel-library-dev,slystopad/fuel-lib,SmartInfrastructures/fuel-library-dev,stackforge/fuel-library,huntxu/fuel-library,zhaochao/fuel-library,xarses/fuel-library,xarses/fuel-library,zhaochao/fuel-library,SmartInfrastructures/fuel-library-dev,stackforge/fuel-library,eayunstack/fuel-library,zhaochao/fuel-library,eayunstack/fuel-library,huntxu/fuel-library,huntxu/fuel-library,eayunstack/fuel-library,Metaswitch/fuel-library,Metaswitch/fuel-library,stackforge/fuel-library,huntxu/fuel-library,eayunstack/fuel-library,ddepaoli3/fuel-library-dev,SmartInfrastructures/fuel-library-dev,Metaswitch/fuel-library,huntxu/fuel-library,ddepaoli3/fuel-library-dev,SmartInfrastructures/fuel-library-dev,eayunstack/fuel-library,ddepaoli3/fuel-library-dev,stackforge/fuel-library,zhaochao/fuel-library,xarses/fuel-library,slystopad/fuel-lib,ddepaoli3/fuel-library-dev,slystopad/fuel-lib,xarses/fuel-library,slystopad/fuel-lib