* messing with submodule/subtree merging strategy