Revert "Resolve conflicts"
Revert "Resolve conflicts"

This reverts commit 89a53a51ed342f087762b2e631b84916c77f6afc, reversing
changes made to 004131ed9c41dbd973345539dedfae8169b8c7e5.

ScottLogic/bitflux-openfin,ScottLogic/StockFlux,ScottLogic/StockFlux,ScottLogic/bitflux-openfin,owennw/OpenFinD3FC,owennw/OpenFinD3FC