Fix sketchy hax for pid killing
Fixed merge conflict