second merge test, with branch