Finally fixed conflicts?