fix rebuildstaging to identify merge conflicts including submodules