Merge conflict fix #71

Job	Run time
Detect File Changes	27s
Github \| Docker	1h 32m 1s
Github (ubuntu, mpi, debug, true)	29m 56s
Self Hosted	0s
Github (ubuntu, mpi, debug, false)	47m 35s
Github (ubuntu, mpi, no-debug, true)	1h 9m 38s
Github (ubuntu, mpi, no-debug, false)	1h 33m 2s
Github (macos, mpi, debug, false)	33m 56s
Github (macos, mpi, no-debug, false)	32m 26s
Github (ubuntu, no-mpi, no-debug, false)	32m 35s
	7h 11m 36s

Provide feedback