Add merge warning