merging styleguide