styling changes
fixed merge conflicts