merge datachannels, update jade doctype