Fixed up hearts.
Fixed merge conflicts.