fix rebuildstaging to identify merge conflicts including submodules
Merge pull request #2323 from dimagi/rebuildstaging-submodule-conflict

fix rebuildstaging to identify merge conflicts including submodules