continue merge.  deleted some unneeded files