Fix bad merge in test-push