hopefully deleting files
trying to merge