more corrections
fixed merge error