Working through conflicts