added setdbquery class
conflict resolved