before merge
fixed conflicts