Add DU merge conflict test
Add merge conflict tests(UD,DD), and refactor