border on buttons
Resolved conflict