healthbar refactored
fixed merge conflicts