Fix merge

src/technologies.json

@@ -6680,20 +6680,6 @@
       "scripts": "^immutable\\.(?:min\\.)?js$",
       "website": "https://facebook.github.io/immutable-js/"
     },
-    "Impact": {
-      "cats": [
-        71,
-        61
-      ],
-      "description": "Impact helps businesses contract and pay partners.",
-      "icon": "Impact.svg",
-      "js": {
-        "ImpactRadiusEvent": "",
-        "irEvent": ""
-      },
-      "scripts": "d\\.impactradius-event\\.com",
-      "website": "https://impact.com/"
-    },
     "Imperva": {
       "cats": [
         16
@@ -11794,6 +11780,35 @@
       "icon": "Rezgo.svg",
       "website": "https://www.rezgo.com"
     },
+<<<<<<< HEAD
+=======
+    "Impact": {
+      "cats": [
+        71,
+        61
+      ],
+      "description": "Impact helps businesses contract and pay partners.",
+      "icon": "Impact.svg",
+      "js": {
+        "ImpactRadiusEvent": "",
+        "irEvent": ""
+      },
+      "scripts": "d\\.impactradius-event\\.com",
+      "website": "https://impact.com/"
+    },
+    "Rewardful": {
+      "cats": [
+        71,
+        61
+      ],
+      "description": "Rewardful is a way for SaaS companies to setup affiliate and referral programs with Stripe.",
+      "icon": "Rewardful.svg",
+      "js": {
+        "Rewardful": ""
+      },
+      "scripts": "r\\.wdfl\\.co",
+      "website": "https://www.getrewardful.com/"
+    },
     "Rickshaw": {
       "cats": [
         25
@@ -14368,6 +14383,7 @@
         61
       ],
       "description": "Tradedoubler is a global affiliate marketing network.",
+      "icon": "Tradedoubler.svg",
       "dom": {
         "a[href*='clk.tradedoubler.com/click']": {
           "text": ""
@@ -14376,7 +14392,6 @@
           "text": ""
         }
       },
-      "icon": "Tradedoubler.svg",
       "website": "https://www.tradedoubler.com/"
     },
     "Transifex": {
@@ -17753,4 +17768,4 @@
       "website": "https://www.xt-commerce.com"
     }
   }
-}
+}