Database Handler
fix conflict