Improved submodule merge support