Database Adding
Fixed conflicts