fixing issue caused by merge conflict
fixing issue caused by merge conflict

PayloadDev/netsuite,oafridi/netsuite,greggroth/netsuite,jeperkins4/netsuite,stripe/netsuite,jheth/netsuite,nurelm/netsuite,mavenlink-solutions/netsuite,littlebitselectronics/netsuite,charitywater/netsuite,breestanwyck/netsuite,NetSweet/netsuite,dropstream/netsuite,sherriously/netsuite,prburke/netsuite,centro/netsuite