Manual merge of latest changes and retry policies.