modification based on new design
fixed conflict
resolve conflicts
fixed conflicts