Fix merge conflict issue

Author: jataylo

test/inductor/test_torchinductor.py

@@ -5071,7 +5071,6 @@ def fn(x):
 
         self.common(fn, (x,))
 
-<<<<<<< HEAD
     def test_polar(self):
         def fn(dist, angle):
             return torch.polar(dist, angle)