more style updates
resolved conflicts