Fixed merge conflicts
Implemented database