new modification
fixed conflicts