submodule updates
resolving merge conflicts