1. add 2 new tables
2. Modify bookmarked page
solve conflicts