What happens when a branch containing a submodule and a branch tracking a remote are merged?
Nothing special: a submodule is just an entry in the index, a gitlink.
As long as that entry (like a folder name) doesn't conflict with the same name from the other branch, the merge will proceed.