Auto-merging src/infrastructure/storage/management/workflow/PhabricatorStorageManagementShellWorkflow.php
CONFLICT (content): Merge conflict in src/infrastructure/storage/management/workflow/PhabricatorStorageManagementShellWorkflow.php
Squash commit -- not updating HEAD
Automatic merge failed; fix conflicts and then commit the result.