Add mrore type translations
Resolve conflicts