Updated 211 language
Resolved merge conflict in resources template