siteinfo locales
shop commit
conflicts
conflicts