i hope someone can help me. iam living in norway and season 6 is on tv now, is one thing i will know, why is Peyton so Angry at Julian? Will Marvin Died or not?

She's angry at Julian because he came back to Tree Hill and everyone thought he came back for her and Lucas was acting all weird when she told him about her relationship with Julian, and she's also angry at him because she thought he was going to brake Brooke's heart, but she was wrong. I don't know exactly if I'm saying everything right because i haven't seen each episode in detail, but i think that's it :)