Resolved merge conflict in template_preprocess_ting_object()