Numerical Study to Enhance the Melting and Solidification of Phase Change Material Using Branched Fins and Nano-Particles