ryang
committed
on 12 Dec 10
remove conflicts in html docs