minor changes
fixed merge conflicts