Fix: Merge issue with main asset file