Merge drak_khatar