I think I successfully merged testBranch2 and master