reordered the styleguide
fixing conflicts