diff --git a/.flowconfig b/.flowconfig
index a5646949052..803f0b4bee2 100644
--- a/.flowconfig
+++ b/.flowconfig
@@ -18,5 +18,6 @@ update-server/.*
 [options]
 module.name_mapper='^default\-containers\.json$' -> '@opentrons/components/interfaces/default-containers.json.js'
 module.name_mapper.extension='css' -> '@opentrons/components/interfaces/CSSModule.js'
+merge_timeout=300
 
 [strict]