Compromise when you can, but accept that sometimes conflict is unavoidable.
Conflict is always lurking, only a well articulated opinion away. But sometimes conflict is irrational, it has nothing to do with what one thinks or does. Conflict can appear simply because of the way someone is reflects badly by contrast on what someone else is not.
The art and science of the possible 