resolving merge conflicts

1 job for !139 with msrivastava/resiliency-extension-legal in 3 minutes and 10 seconds
latest merge request