Deleting the failed merge stuff