minor changes
fixed merge error