test merge and push master