Database is done
Fixed conflicts