Show a button if it's a merge conflict
Show a button if it's a merge conflict

kactus-io/kactus,say25/desktop,gengjiawen/desktop,shiftkey/desktop,desktop/desktop,artivilla/desktop,gengjiawen/desktop,kactus-io/kactus,kactus-io/kactus,desktop/desktop,shiftkey/desktop,artivilla/desktop,artivilla/desktop,hjobrien/desktop,j-f1/forked-desktop,say25/desktop,shiftkey/desktop,shiftkey/desktop,desktop/desktop,desktop/desktop,gengjiawen/desktop,hjobrien/desktop,hjobrien/desktop,j-f1/forked-desktop,artivilla/desktop,say25/desktop,gengjiawen/desktop,j-f1/forked-desktop,say25/desktop,j-f1/forked-desktop,kactus-io/kactus,hjobrien/desktop