Auto-merging config/locales/fr.yml
CONFLICT (content): Merge conflict in config/locales/fr.yml
Automatic merge failed; fix conflicts and then commit the result. (1)
Auto-merging config/locales/pt.yml
CONFLICT (content): Merge conflict in config/locales/pt.yml
Automatic merge failed; fix conflicts and then commit the result. (1)