merged projects but I don't think heart app is working