Fixing merge changes in translation file