fixed problem of buttons not disappearing on merge