michaelg/dev: links for splitconflict