updated styleguide
fixing conflicts