second merge commit