minor changes
fixed merge