editting homepage
fixed merge I hope
actually fixed merge