updated some modules in styleguide
fixing conflicts