manually dealt with all merge conflicts between button styles and layout styles