small style changes
fixed merge conflict