Merging khan branch