To develop your conflict management and resolution skills, it is essential that you engage in reflective practice. This is what will take you from being a merely competent practitioner, to a level of artistry in what you do. It will develop your ability to manage the unexpected, and hone your intuition based on solid learning (not just some kind of gut feeling).