Fixed some merge / stash conflict issues
Trying to fix stash merge issue again
Fixed Composer to send proper encryption value