final merge fixes

Plugged in Health bar in the Inspector