modification to buttons
merge confl