fixed conflicts, button shows