merge changes regarding to REST-API