Connector new flow test, testing curl
Resolving merge conflicts