Improve merge error messages

Currently, the error messages from merging are not very helpful:
```
returned a non-nil error: couldn't merge YAML sources: can't merge a scalar into a mapping
```

It'd be nice to have some information on what key failed.