homepage edits. possible git conflict