resolve conflicts
fix line spacing in hero