merge conflicts
fixing buttons
merge conflicts