Code

add missing && to submodule-merge testcase