fix incorrect merge for gatling ivy configuration changes