Fix spacing errors
Fix version conflicts
fix(translations): merge pr