So far the ways I have done it is clunky and create a lot of hassles when I get a new version of ExB. I'm redoing our repo to check in at the project level (one level up from client and server), is there a way to merge new ExB in the existing branch once I get the new ExB?