merged and push