Jen Bunney-Lauren Conrad's fight!? On The Hills.?

After what happened with Lauren and Jen at Jens Birthday Party (on The Hills) they were never shown again made up. Did they ever make up? I Hope they did cuz they have been friends for 15+ years. Please help!