working through conflicts