Conflict resolution, all those things, are important. When you're in a group environment, you have to have those. If you don't, things fester. Have the conversation. Resolve it. Move forward.
If you look at the teams that mix and match their starting lineup a great deal, that sort of inconsistency frequently leads to inconsistency in performance.
