submodule updates
resolving merge conflict