fix: merge conf

Jacky Zhao

2022-05-05 364aee36fc8891c48ab2bd20c396ce321cd7a0a6

layouts/partials/popover.html does not exist in tree 28b75cbf21b5936aada8f5ece5d12beafa70b5c1