stuff
fixed merge conflicts
fixed home issue