merge

Signed-off-by: Haytham Abuelfutuh <[email protected]>

go.mod

@@ -7,7 +7,6 @@ require (
 	cloud.google.com/go/storage v1.6.0
 	github.com/NYTimes/gizmo v1.3.5
 	github.com/Selvatico/go-mocket v1.0.7
-	github.com/alvaroloes/enumer v1.1.2 // indirect
 	github.com/aws/aws-sdk-go v1.29.23
 	github.com/benbjohnson/clock v1.0.0
 	github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b // indirect
@@ -26,7 +25,7 @@ require (
 	github.com/jinzhu/gorm v1.9.12
 	github.com/kelseyhightower/envconfig v1.4.0 // indirect
 	github.com/lib/pq v1.3.0
-	github.com/lyft/flyteidl v0.18.11
+	github.com/lyft/flyteidl v0.18.14
 	github.com/lyft/flytepropeller v0.5.14
 	github.com/lyft/flytestdlib v0.3.9
 	github.com/magiconair/properties v1.8.1