- Resolved conflict in web/src/components/RbModal/index.tsx - Combined className and maskClosable properties