- Added Type operator default implementation
- Fix conflict