merchant uid fix