git commit merge branch Sticker