restore margin on button (merge error)