first commit of MergeTester
second commit of MergeTester
playing with code