Auto-merging js/web/_i18n/ru.json Auto-merging js/web/_i18n/pt-br.json Auto-merging js/web/_i18n/nl.json Auto-merging js/web/_i18n/fr.json Auto-merging js/web/_i18n/en.json CONFLICT (content): Merge conflict in js/web/_i18n/en.json Automatic merge failed; fix conflicts and then commit the result. (1)3 years ago