Add Alef Font
Resolve conflict