corrects error during merge!