I Have Been Having Discomfort In My Upper Right Abdomen

I have been having discomfort in my upper right abdomen area for several months. In the last couple of months, it has escalated into pain, not just discomfort. I thought I may be having gall bladder issues. I have had an ultrasound, which showed no gall stones. I had a HIDA scan, and gall bladder seems to be functioning properly. I have an endoscopy and colonoscopy scheduled at the end of next week. I cannot sleep on my right side AT ALL! It feels like I have a bulge on the back side of where my pain is. Could I possibly have a hiatal hernia or a lipoma?