Managing and resolving relationship conflicts