Fixed merge conflict, respawning