[Styleguide] merge