fix branches with conflicts/errors

[Eskan0r]

chrome-extension-nextjs has pushed merge conflicts so fix that and make sure it runs without error. there might be some other branches with similar issues, check and make sure we good