Fixing merge problem with translations