style changes, vars added, section added
conflicts solved