fix merge conflict with bestpractices/querying