fixed conflicts for real