How to renew a relationship after a conflict