pleiades_manager: conflict fix
pleiades_manager: conflict fix

NeoGeographyToolkit/StereoPipeline,ScottMcMichael/StereoPipeline,ScottMcMichael/StereoPipeline,ScottMcMichael/StereoPipeline,oleg-alexandrov/StereoPipeline,oleg-alexandrov/StereoPipeline,NeoGeographyToolkit/StereoPipeline,oleg-alexandrov/StereoPipeline,oleg-alexandrov/StereoPipeline,NeoGeographyToolkit/StereoPipeline,ScottMcMichael/StereoPipeline,NeoGeographyToolkit/StereoPipeline,oleg-alexandrov/StereoPipeline,oleg-alexandrov/StereoPipeline,ScottMcMichael/StereoPipeline,NeoGeographyToolkit/StereoPipeline,NeoGeographyToolkit/StereoPipeline,ScottMcMichael/StereoPipeline