tested things out on home page
fixed merging conflicts