Fix issue when merging translation from previous merge