fixing merge issue REST API