add ones
add twos
merge branch2 + new row