changed line-spacing of typography
fixing conflicts
adding the latest-spotlights module
fixing conflicts