hand-merge of quest progress