As a user I would like a means to handle merge conflicts on my translation files

[Aerex]

Context

When a user uses git to merge changes from upstream to a local branch it is possible to run into merge issues for translation files. There is no easy way to select which translations messages to keep, merge or remove.

The user may need to override any local changes with changes from upsteam and redo adding the local changes to handle the merge conflict, cleanly.

We should find a better to make this easier for the user