expecting conflicts
front styling changes