Automatically merge existing subtrees
Derp, use `ours` strategy for initial merge