Merge conflict fix #72

Job	Run time
Detect File Changes	26s
Github \| Docker	1h 32m 49s
Github (ubuntu, mpi, debug, true)	54m 6s
Self Hosted	0s
Github (ubuntu, mpi, debug, false)	1h 16m 0s
Github (ubuntu, mpi, no-debug, true)	1h 9m 36s
Github (ubuntu, mpi, no-debug, false)	1h 32m 21s
Github (macos, mpi, debug, false)	30m 32s
Github (macos, mpi, no-debug, false)	32m 35s
Github (ubuntu, no-mpi, no-debug, false)	34m 5s
	8h 2m 30s

Provide feedback