my project
file was deleted
deleted  method "deleteLetterInTrash"
Merge branch 'branch2'

Conflicts:
	src/test/java/com/epam/steps/Step.java