Resolved merge conflict in tpl file
Resolved merge conflict in ting_relation_ding_entity_buttons()