Today, Shawn thanked Mimi for helping them figure out what was going on with Claire. He was sincere, too. It made me cry! %( ;) I think it is so cool that Belle, Shawn, Max and Mimi can work together to save Claire! So, yes, I think they have put everything behind them and can be friends again!