better error reporting during merge