style updates
merge conflicts