[Fix] Improved type conflicts