finish add a heart after 8 miniutes
my mind is playing tricks on me
conflicts fixed in TPMainScreen
fix conflict