fix merge conflicts

Author: osulzhenko

src/test/groovy/org/prebid/server/functional/tests/CacheSpec.groovy

@@ -126,6 +126,7 @@ class CacheSpec extends BaseSpec {
     def "PBS should cache bids without api-key header when targeting is specified and api-key-secured disabled"() {
         given: "Pbs config with disabled api-key-secured and pbc.api.key"
         def apiKey = PBSUtils.randomString
+        def pbsConfig = ['pbc.api.key': apiKey, 'cache.api-key-secured': 'false']
         def pbsService = pbsServiceFactory.getService(['pbc.api.key': apiKey, 'cache.api-key-secured': 'false'])
 
         and: "Default BidRequest with cache, targeting"
@@ -142,12 +143,16 @@ class CacheSpec extends BaseSpec {
 
         and: "PBS call shouldn't include api-key"
         assert !prebidCache.getRequestHeaders(bidRequest.imp[0].id)[PBS_API_HEADER]
+
+        cleanup: "Stop and remove pbs container"
+        pbsServiceFactory.removeContainer(pbsConfig)
     }
 
     def "PBS should cache bids with api-key header when targeting is specified and api-key-secured enabled"() {
         given: "Pbs config with api-key-secured and pbc.api.key"
         def apiKey = PBSUtils.randomString
-        def pbsService = pbsServiceFactory.getService(['pbc.api.key': apiKey, 'cache.api-key-secured': 'true'])
+        def pbsConfig = ['pbc.api.key': apiKey, 'cache.api-key-secured': 'true']
+        def pbsService = pbsServiceFactory.getService(pbsConfig)
 
         and: "Default BidRequest with cache, targeting"
         def bidRequest = BidRequest.defaultBidRequest.tap {
@@ -163,6 +168,9 @@ class CacheSpec extends BaseSpec {
 
         and: "PBS call should include api-key"
         assert prebidCache.getRequestHeaders(bidRequest.imp[0].id)[PBS_API_HEADER] == [apiKey]
+
+        cleanup: "Stop and remove pbs container"
+        pbsServiceFactory.removeContainer(pbsConfig)
     }
 
     def "PBS should cache banner bids with cache key that include account and datacenter short name when append-trace-info-to-cache-id enabled"() {