Fix conflict in pkg/config test
Fix conflict in pkg/config test

Signed-off-by: Tiffany Harris <d1f145848d194a123b1c9e07ae428794bd7b9848@ibm.com>

jimthematrix/fabric,jimthematrix/fabric,manish-sethi/fabric-sidedb,muralisrini/fabric,manish-sethi/fabric-sidedb,manish-sethi/fabric-sidedb,manish-sethi/fabric-sidedb,muralisrini/fabric,muralisrini/fabric,manish-sethi/fabric,stemlending/fabric,hyperledger/fabric,manish-sethi/fabric-sidedb,stemlending/fabric,stemlending/fabric,stemlending/fabric,hyperledger/fabric,manish-sethi/fabric-sidedb,manish-sethi/fabric-sidedb,manish-sethi/fabric