Yes both power supply are fighting each other. here is how it can be done
The ideal product for your application will be this one
thanks