Fix submodules Flux and pythonhelpers
Fix conflicts