I haven't finished reviewing the whole pull req, but I noticed a guarantee for conflict in #1508 . If you could fix the misshapen div tag instead (there's an extra less-than sign), we could close the other one and it would be neat. *g*