Fix merge conflict

doc/tex/mod/Daystat

doc/tex/mod/Dhourstat

doc/tex/mod/Dminutestat

doc/tex/mod/Exprf

doc/tex/mod/Hourstat

doc/tex/mod/Merstat

doc/tex/mod/Monstat

doc/tex/mod/Runstat

doc/tex/mod/Seasstat

doc/tex/mod/Timselstat

doc/tex/mod/Vertstat

doc/tex/mod/Ydaystat

doc/tex/mod/Ydrunstat

doc/tex/mod/Yearstat

doc/tex/mod/Yhourstat

doc/tex/mod/Ymonstat

doc/tex/mod/Yseasstat

doc/tex/mod/Zonstat

src/cdo.cc

src/factory.cc