just fixing changes
fixed conflicts