styling changes
resolved conflicts