added descriptions
fixed conflicts