The change doesn't merge automatically, and I'm getting a strange conflict when I try to merge manually:

```
      archiveDir(archiveFile, sourceDir, function(error) {
        if (error) {
          if (next) {
<<<<<<< HEAD
            next(error);
=======
            // detect success/error and report to the "next" callback
            if (res.error) {
              next(res.error + ": "+res.message, res.appId);
            } else {
              next(null, config);
            }
>>>>>>> 514ebde8246e229a7d6f80ef4b7ec8f49aa31ca6
```

It isn't clear where the chunk from 514ebde8246e229a7d6f80ef4b7ec8f49aa31ca6 is coming from, but it does seem to be in the wrong place, as *archiveDir()*'s callback doesn't have a *res* parameter, it has an *error* parameter.

There is a code block like the one in the chunk a few lines down from there. But that one is indented twenty spaces rather than twelve. Nevertheless, it doesn't contain the necessary change, so I'm guessing that it is where the change should be made, and Git's merge algorithm somehow got it wrong (and changed the indent in the process?).