So far as it depends on you...  Rom. 12:18 shows us that we have responsibility when it comes to conflict.  We also see that "sin" is crouching outside our door when we get angry.