Better error when threeway merge fails

Fixes #8