fixed the database problem
merge