Better reporting of merge errors