improved merge error output