changed bio
fixed conflicts