Fix merchant new_address