push from ubuntu 1
push 2 from ubuntu
add from window1
add from window2
merge
merge try