Deleted merge error