fixing merge conflict

1 job for !26 with users/amaverma/addBootStrapingStep in 7 seconds (queued for 2 seconds)
merge request