Liver or stomach issues? Strange feeling right upper abdomen.

Hi ,
I'm having problems with stomach acid for years now.
I had two cures of omprazole which make things better for a time but as soon as I stop using them, the problems are back. I stopped drinking coffee now and this makes things better but I'm still having discomfort so I'm scheduled for a gastroendoscopy next month.
In the meantime,  I'm also having some strange feeling in my right upper abdomen. Not real pain but just a feeling like something is there. I'm thinking it's from the liver but that's just a guess off course. My doctor said it can be because I gained some weight (5 kg the last six months) and that my liver is fatty. He scheduled an echo of the liver and gallblader (gallbladder) at the same I'm having the gastroendoscopy.
Off course I'm terrified in the meantime since google tells me all kinds of bad stuff first. Anyone with similar problems or advice?

Thanks,