Adding respawn rabbit
Resolve conflicts