ready to make db
merge fixed