QueryBuilderInterface
Clean up merge errors