Kinda sorta got helpfulness
Fixed merge conflicts