Any solid agreement should have a defined conflict resolution process. While nobody wants to have to use a conflict resolution process, the time to develop these processes is long before you need them. In fact, just having them in place can help you avoid problems down the road.
