add sprite and map
merge conflicts