merge and push
up