fixed merge error and refactored health mod code