Gardeslime Disappear!
Fix merge conflicts