Fix the graphical error messages for merges