add querying
fix conflict