Merge changes with submodule