added merged config to replace std 5311 checkout