buttons added
fixed conflicts