chat
fixed conflicts