Auto-merging src/applications/phurl/controller/PhabricatorPhurlURLViewController.php
CONFLICT (content): Merge conflict in src/applications/phurl/controller/PhabricatorPhurlURLViewController.php
Squash commit -- not updating HEAD
Automatic merge failed; fix conflicts and then commit the result.