fix merge conflict

Author: alchzh

plugins/amazon.py

@@ -78,7 +78,7 @@ def amazon(text, _parsed=False):
     try:
         price = item.find('span', {'class': ['s-price', 'a-color-price']}).text
     except AttributeError:
-        for i in item.find_all('sup', {'class': 'sx-price-fractional'}):
+        for i in item.find_all('sup', class_='sx-price-fractional'):
             i.string.replace_with('.' + i.string)
         price = item.find('span', {'class': 'sx-price'}).text