removed duplicate files
removed duplicate sprites
fixed merge conflict