sticker movment
merge conflict