fix azure merge