modified method
merge conflicts
test for delete method