merge today & comment