Cannot heal for more than max HP now
fixed merge conflicts