views use i18n
Fix merge conflict