attempt at merge 1, where merge 1 is merge of testBranch1 and master