adject format on ruby class
it is test for rebase and conflict
test conflict on current branch
Merge branch 'example-1' of github.com:Shinetechchina/refinerycms-stores into example-1