Lots of merges live including translations and article