minor changes
fixed merge conflict