Fixed language file conflicts