UTI or kidney stone?

Hi, I have been having this intense (mild) pain right below my rib cage for about a week now. I looked up the symptoms for UTI and kidney stone and I do not have any of the symptoms listed except for the pain. Can this pain go away or is this UTI and/or kidney stone related? I used to have kidney stone where there was blood in my urine, but that stopped and healed 5 years ago. Can kidney stone come back? What should I do? Please help. Thank you very much.