Fix merge conflicts to allow Homepageredux -> Master