make husk and husk-git conflicts of each other