Nevermind, I just got it, sorry. I used v1i + v1f = v2i + v2f and set v2f equal to (v1i + v1f), since v2i is zero, and solved to get -4.24 m/s for the velocity after collision, then used the KE=PE rule to solve for the height, 0.92 m.
Thanks for the tips!
One question: the equation above, v1i...