Add desktoggle
Add conflict to desktoggle-git