fixed player dying
Merge stuff