committing from head^^ adding file b
again from head^^ adding file b1
Merge branch 'master' into foo