working through conflict