Merge, better error messages