Of course you should take care of a “brewing” conflict and look into the matter as soon as possible, so I don’t blow up in your face and damage the working environment at the company. The trick is to build in a nice atmosphere that generates productivity and prevent upcoming conflicts. Are all employees aware of the mission and vision statement and how to implement these ideas through the whole organization? Look at the “bottle necks” by applying the method of “theory of constraints” by Eli Goldratt.