merge gosexy/db