conflics fixed