- decided that removing files would cause conflicts on merge