Code

add tests for merging with submodules