Added buttons
Fixing MErge