Merged khmer with ged master