Changed Troll to use sprites
Fixed merge conflict
Fixed merge conflict