merge today rjd ljd