submodules can be scary.  probably the scariest thing to do with them is resolve merge conflicts.  so, here's a script that demonstrates doing so.  (it's not so unusual.)