deleted button
fixed conflicts