Fixed loading sprites
Fix unlinking
Fix merge conflict again