Added the abort merge thing