add code from simpler template, and identify TODO conflicts between two templates that will have to be resolved
remove extra div close, make div close comment location consistent, add additional TODO's to reconcile differences between templates