fixed merge conflict in sprite