fixwd DB
merge