merge pushQuery branch