fix merge error from tab settings
Merge branch 'merge-master-plugin-config' of https://github.com/HeatherHillers/Roam into merge-master-plugin-config