added delete method to List
conflict changes