git-merge-conflict Sticker