Put Canvas back in en.yml
Handled a merged conflict