revert styles to try and fix conflict issues

revert styles to try and fix conflict issues