Don’t avoid conflict. Allow me to explain. If there is an issue that could lead to larger challenges and difficulties in years to come it is important to have it addressed as soon as possible. Walking around pretending that everything is wonderful, great and perfect 24/7/365 serves no one currently and is definitely of no value to anyone long-term.
Do not walk on eggshells around certain topics or certain people and do not pretend as if you have to wear white velvet gloves because certain things cannot be touched and fingerprints cannot be left behind. If there is an issue that needs to be addressed, address it promptly and do it politely, professionally, respectfully and behind closed doors.
While the process will vary across organizations, it is important to (by all means) address the issues and challenges which have the potential of developing into much larger problems with time. Act now.