Test
Resolving conflicts
Added DB support