DB Driver added. Merge errors fixed