A crisis makes for strange bedfellows. Now that you and a rival have seen the best in each other, maybe you’re ready to let bygones be bygones?