Merge with nullquery branch