fix popup
swap database.sql
solve conflict
fixed bugs list