merging JackBranch