07 late merge