Conflicts with mercurial