git merge with cowboy hat Sticker