actually fixed conflicts