Remove remains from sloppy merge