merging conflicts on configurations
merging conflicts on configurations

nimble-platform/frontend-service,nimble-platform/frontend-service,nimble-platform/frontend-service,nimble-platform/frontend-service