finally got a heart to display
fixed a merge problem