Re: evil conflicts in c-mode