Add merge conflicts