ubase-git: add conflicts.