minor corrections
fixed merge conflict