conflicts emerald-git
