been workin with da scrolling header yo
solve merge conflict