Show informative error message when a merge conflict is detected in a YAML file.

This fixes issue #69.
All in one nice, squashed commit.
:smiley: