style changes
settled conflict