SKIP the conflict/resolution interview when (if) you go back.
How many issues you butted heads on were so severe that someone would be hurt, cost would go up/down dramatically, etc. In other words, how important were they really?
If you can't change, don't go back, the owner won't change...