fix conflicts

Author: AntoxaAntoxic

src/test/java/org/prebid/server/activity/infrastructure/privacy/usnat/inner/USNatSyncUserTest.java

@@ -236,7 +236,7 @@ public void proceedShouldDisallowIfKnownChildSensitiveDataConsents2Equals2() {
     public void proceedShouldDisallowIfKnownChildSensitiveDataConsents3Equals1() {
         // given
         given(gppReader.getKnownChildSensitiveDataConsents()).willReturn(asList(3, 3, 1));
-        final PrivacyModule target = new USNatSyncUser(gppReader);
+        final PrivacyModule target = new USNatSyncUser(gppReader, null);
 
         // when
         final Rule.Result result = target.proceed(null);

src/test/java/org/prebid/server/activity/infrastructure/privacy/usnat/inner/USNatTransmitGeoTest.java

@@ -158,7 +158,7 @@ public void proceedShouldDisallowIfKnownChildSensitiveDataConsents2Equals2() {
     public void proceedShouldDisallowIfKnownChildSensitiveDataConsents3Equals1() {
         // given
         given(gppReader.getKnownChildSensitiveDataConsents()).willReturn(asList(3, 3, 1));
-        final PrivacyModule target = new USNatTransmitGeo(gppReader);
+        final PrivacyModule target = new USNatTransmitGeo(gppReader, null);
 
         // when
         final Rule.Result result = target.proceed(null);

src/test/java/org/prebid/server/activity/infrastructure/privacy/usnat/inner/USNatTransmitUfpdTest.java

@@ -318,7 +318,7 @@ public void proceedShouldDisallowIfKnownChildSensitiveDataConsents2NotEquals0()
     public void proceedShouldDisallowIfKnownChildSensitiveDataConsents3Equals1() {
         // given
         given(gppReader.getKnownChildSensitiveDataConsents()).willReturn(asList(3, 3, 1));
-        final PrivacyModule target = new USNatTransmitUfpd(gppReader);
+        final PrivacyModule target = new USNatTransmitUfpd(gppReader, null);
 
         // when
         final Rule.Result result = target.proceed(null);