Successfully add some buttons
Conflict fixed