styling changes
fixed merge problems