style updates
merge fix