merge branch dxue