Fix last man standing bug
Merge