morning
resolved some bugs on homepage
resolved conflicts