fixed conflicts.