Original: There are other points of tension between quantum mechanics and general relativity. There are a number of proposed quantum gravity theories.
Simplified: The goal of quantum gravity is to develop a theory which contains both general relativity and quantum mechanics.