Attempting to fix auto kill not waiting
Getting severely frustrated at this autokill junk
Merge remote-tracking branch 'origin/master'