Add merge conflict dialog