my project
file was deleted
delete method "deleteLetterInSpam"
Merge branch 'branch2'

Conflicts:
	src/test/java/com/epam/steps/Step.java
deleted method "checkAlert"
deleted method ""deletedLetterInTrash
Merge branch 'branch1'
deleted